Index: sd/source/filter/eppt/epptso.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/filter/eppt/epptso.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 epptso.cxx --- sd/source/filter/eppt/epptso.cxx 17 Apr 2007 15:27:40 -0000 1.1.1.1 +++ sd/source/filter/eppt/epptso.cxx 16 May 2007 20:18:51 -0000 @@ -1735,8 +1735,8 @@ double fCos = cos( (double)mnAngle * F_PI18000 ); double fSin = sin( (double)mnAngle * F_PI18000 ); - double fWidthHalf = maRect.GetWidth() / 2; - double fHeightHalf = maRect.GetHeight() / 2; + double fWidthHalf = maRect.GetWidth() / 2.0; + double fHeightHalf = maRect.GetHeight() / 2.0; double fXDiff = fCos * fWidthHalf + fSin * (-fHeightHalf); double fYDiff = - ( fSin * fWidthHalf - fCos * ( -fHeightHalf ) ); Index: sd/source/filter/html/pubdlg.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/filter/html/pubdlg.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pubdlg.cxx --- sd/source/filter/html/pubdlg.cxx 17 Apr 2007 15:27:40 -0000 1.1.1.1 +++ sd/source/filter/html/pubdlg.cxx 16 May 2007 20:08:44 -0000 @@ -1307,7 +1307,7 @@ return 0; } -static UINT16 nPreviewBitmapOffests[] = { 0,2,4,6,7,8,9,10 }; +static const UINT16 nPreviewBitmapOffsets[] = { 0,2,4,6,7,8,9,10 }; // ===================================================================== // Refresh des Dialogs beim wechsel der Seite @@ -1457,7 +1457,7 @@ for( UINT16 nImage = 0; nImage < 8; nImage++ ) { - if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_HTMLBUTTONS, nModelPos + nPreviewBitmapOffests[nImage], &aThumb ) ) + if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_HTMLBUTTONS, nModelPos + nPreviewBitmapOffsets[nImage], &aThumb ) ) continue; // ValueSet fuellen Index: sd/source/ui/dlg/dlgass.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgass.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgass.cxx --- sd/source/ui/dlg/dlgass.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgass.cxx 16 May 2007 20:59:02 -0000 @@ -255,6 +255,14 @@ AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, BOOL bAutoPilot ); ~AssistentDlgImpl(); +private: + /// The copy constructor is not implemented. Do not use! + AssistentDlgImpl (const AssistentDlgImpl&); + + /// The assignment operator is not implemented. Do not use! + AssistentDlgImpl& operator= (const AssistentDlgImpl&); + +public: /// Local mutex used to serialize concurrent method calls. ::osl::Mutex maMutex; @@ -345,8 +353,6 @@ USHORT mnShowPage; BOOL mbDocPreview; - ULONG mnTemplate; - String maPageListFile; void UpdatePreview( BOOL bDocPreview ); @@ -1268,6 +1274,8 @@ mpPage3LogoCB->Enable(bKiosk); break; } + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } Index: sd/source/ui/dlg/dlgassim.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgassim.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgassim.hxx --- sd/source/ui/dlg/dlgassim.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgassim.hxx 16 May 2007 20:59:31 -0000 @@ -63,6 +63,14 @@ SdPageListControl( Window* pParent, const ResId& rResId ); ~SdPageListControl(); +private: + /// The copy constructor is not implemented. Do not use! + SdPageListControl (const SdPageListControl&); + + /// The assignment operator is not implemented. Do not use! + SdPageListControl& operator= (const SdPageListControl&); + +public: void Fill( SdDrawDocument* pDoc ); void Clear(); Index: sd/source/ui/dlg/dlgolbul.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgolbul.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgolbul.cxx --- sd/source/ui/dlg/dlgolbul.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgolbul.cxx 16 May 2007 20:54:20 -0000 @@ -142,6 +142,8 @@ break; case OBJ_OUTLINETEXT: bOutliner = TRUE; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); break; } } @@ -241,6 +243,8 @@ } } break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } Index: sd/source/ui/dlg/dlgpage.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/dlgpage.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgpage.cxx --- sd/source/ui/dlg/dlgpage.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/dlgpage.cxx 16 May 2007 20:55:29 -0000 @@ -130,6 +130,8 @@ aSet.Put (SfxUInt16Item(SID_TABPAGE_POS,0)); rPage.PageCreated(aSet); break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } Index: sd/source/ui/dlg/headerfooterdlg.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/headerfooterdlg.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 headerfooterdlg.cxx --- sd/source/ui/dlg/headerfooterdlg.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/headerfooterdlg.cxx 16 May 2007 20:08:28 -0000 @@ -127,11 +127,9 @@ HeaderFooterSettings maSettings; Size maPageSize; Rectangle maOutRect; - double mdScaleX; - double mdScaleY; private: - void Paint( XOutputDevice& aXOut, SdrTextObj* pObj, bool bVisible, bool bDottet = false ); + void Paint( XOutputDevice& aXOut, SdrTextObj* pObj, double mdScaleX, double mdScaley, bool bVisible, bool bDottet = false ); public: PresLayoutPreview( ::Window* pParent, const ResId& rResId, SdPage* pMaster ); @@ -876,7 +874,7 @@ // ----------------------------------------------------------------------- -void PresLayoutPreview::Paint( XOutputDevice& aXOut, SdrTextObj* pObj, bool bVisible, bool bDottet /* = false*/ ) +void PresLayoutPreview::Paint( XOutputDevice& aXOut, SdrTextObj* pObj, double mdScaleX, double mdScaleY, bool bVisible, bool bDottet /* = false*/ ) { Rectangle aRect( pObj->GetGeoRect() ); @@ -957,8 +955,8 @@ DecorationView aDecoView( this ); maOutRect = aDecoView.DrawFrame( maOutRect, FRAME_HIGHLIGHT_IN ); - mdScaleX = (double)maOutRect.GetWidth() / (double)maPageSize.Width(); - mdScaleY = (double)maOutRect.GetHeight() / (double)maPageSize.Height(); + double mdScaleX = (double)maOutRect.GetWidth() / (double)maPageSize.Width(); + double mdScaleY = (double)maOutRect.GetHeight() / (double)maPageSize.Height(); // draw page background SetFillColor( Color(COL_WHITE) ); @@ -975,17 +973,17 @@ XOutputDevice aXOut( this ); if( pMasterTitle ) - Paint( aXOut, pMasterTitle, true, true ); + Paint( aXOut, pMasterTitle, mdScaleX, mdScaleY, true, true ); if( pMasterOutline ) - Paint( aXOut, pMasterOutline, true, true ); + Paint( aXOut, pMasterOutline, mdScaleX, mdScaleY, true, true ); if( pHeader ) - Paint( aXOut, pHeader, maSettings.mbHeaderVisible ); + Paint( aXOut, pHeader, mdScaleX, mdScaleY, maSettings.mbHeaderVisible ); if( pFooter ) - Paint( aXOut, pFooter, maSettings.mbFooterVisible ); + Paint( aXOut, pFooter, mdScaleX, mdScaleY, maSettings.mbFooterVisible ); if( pDate ) - Paint( aXOut, pDate, maSettings.mbDateTimeVisible ); + Paint( aXOut, pDate, mdScaleX, mdScaleY, maSettings.mbDateTimeVisible ); if( pNumber ) - Paint( aXOut, pNumber, maSettings.mbSlideNumberVisible ); + Paint( aXOut, pNumber, mdScaleX, mdScaleY, maSettings.mbSlideNumberVisible ); Pop(); } Index: sd/source/ui/dlg/prltempl.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/prltempl.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prltempl.cxx --- sd/source/ui/dlg/prltempl.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/prltempl.cxx 16 May 2007 20:56:22 -0000 @@ -257,8 +257,11 @@ } } break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } + // #112490# the tabpages Alignment, Tabs and Asian Typography are very // usefull, except for the background style if( (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE) || (DlgId.GetId() == TAB_PRES_LAYOUT_TEMPLATE_3) ) @@ -440,6 +443,7 @@ aFrmt.SetAbsLSpace( (short) rLRItem.GetTxtLeft() ); aFrmt.SetFirstLineOffset( rLRItem.GetTxtFirstLineOfst() ); pNumRule->SetLevel( GetOutlineLevel(), aFrmt ); + } } Index: sd/source/ui/dlg/prntopts.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/prntopts.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prntopts.cxx --- sd/source/ui/dlg/prntopts.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/prntopts.cxx 16 May 2007 21:12:15 -0000 @@ -53,7 +53,7 @@ #include // STATIC DATA ----------------------------------------------------------- -static USHORT pPrintOptRanges[] = +static const USHORT pPrintOptRanges[] = { ATTR_OPTIONS_PRINT, ATTR_OPTIONS_PRINT, @@ -242,7 +242,7 @@ //----------------------------------------------------------------------- -USHORT* SdPrintOptions::GetRanges() +const USHORT* SdPrintOptions::GetRanges() { return pPrintOptRanges; } Index: sd/source/ui/dlg/tabtempl.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/tabtempl.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tabtempl.cxx --- sd/source/ui/dlg/tabtempl.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/tabtempl.cxx 16 May 2007 20:57:15 -0000 @@ -242,6 +242,8 @@ rPage.PageCreated(aSet); } break; + default: + DBG_ASSERT( false, "Unexpected value in switch!" ); } } @@ -264,3 +266,5 @@ + + Index: sd/source/ui/dlg/tpaction.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/dlg/tpaction.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tpaction.cxx --- sd/source/ui/dlg/tpaction.cxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/dlg/tpaction.cxx 16 May 2007 21:14:36 -0000 @@ -159,7 +159,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; -static USHORT pActionRanges[] = +static const USHORT pActionRanges[] = { ATTR_ANIMATION_TRANSPCOLOR, ATTR_ANIMATION_TRANSPCOLOR, @@ -496,7 +496,7 @@ //------------------------------------------------------------------------ -USHORT* SdTPAction::GetRanges() +const USHORT* SdTPAction::GetRanges() { return( pActionRanges ); } Index: sd/source/ui/inc/BreakDlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/BreakDlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 BreakDlg.hxx --- sd/source/ui/inc/BreakDlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/BreakDlg.hxx 16 May 2007 21:00:04 -0000 @@ -93,7 +93,13 @@ short Execute(); private: - FixedText aFtObjInfo; + /// The copy constructor is not implemented. Do not use! + BreakDlg (const BreakDlg&); + + /// The assignment operator is not implemented. Do not use! + BreakDlg& operator= (const BreakDlg&); + + FixedText aFtObjInfo; FixedText aFtActInfo; FixedText aFtInsInfo; Index: sd/source/ui/inc/OutlineBulletDlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/OutlineBulletDlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 OutlineBulletDlg.hxx --- sd/source/ui/inc/OutlineBulletDlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/OutlineBulletDlg.hxx 16 May 2007 21:00:43 -0000 @@ -69,7 +69,13 @@ private: using SfxTabDialog::GetOutputItemSet; - SfxItemSet aInputSet; + /// The copy constructor is not implemented. Do not use! + OutlineBulletDlg (const OutlineBulletDlg&); + + /// The assignment operator is not implemented. Do not use! + OutlineBulletDlg& operator= (const OutlineBulletDlg&); + + SfxItemSet aInputSet; SfxItemSet *pOutputSet; BOOL bTitle; ::sd::View *pSdView; Index: sd/source/ui/inc/custsdlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/custsdlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 custsdlg.hxx --- sd/source/ui/inc/custsdlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/custsdlg.hxx 16 May 2007 21:01:04 -0000 @@ -121,6 +121,12 @@ DECL_LINK( ClickButtonHdl, void * ); DECL_LINK( OKHdl, Button* ); + /// The copy constructor is not implemented. Do not use! + SdDefineCustomShowDlg (const SdDefineCustomShowDlg&); + + /// The assignment operator is not implemented. Do not use! + SdDefineCustomShowDlg& operator= (const SdDefineCustomShowDlg&); + public: SdDefineCustomShowDlg( Window* pWindow, Index: sd/source/ui/inc/dlgass.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/dlgass.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 dlgass.hxx --- sd/source/ui/inc/dlgass.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/dlgass.hxx 16 May 2007 21:01:29 -0000 @@ -77,6 +77,12 @@ public: AssistentDlg(Window* pParent, BOOL bAutoPilot); ~AssistentDlg(); + /// The copy constructor is not implemented. Do not use! + AssistentDlg (const AssistentDlg&); + + /// The assignment operator is not implemented. Do not use! + AssistentDlg& operator= (const AssistentDlg&); + DECL_LINK( FinishHdl, OKButton * ); Index: sd/source/ui/inc/headerfooterdlg.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/headerfooterdlg.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 headerfooterdlg.hxx --- sd/source/ui/inc/headerfooterdlg.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/headerfooterdlg.hxx 16 May 2007 21:01:54 -0000 @@ -73,7 +73,6 @@ HeaderFooterSettings maSlideSettings; HeaderFooterSettings maNotesHandoutSettings; - bool mbNotOnTitle; SdDrawDocument* mpDoc; SdPage* mpCurrentPage; @@ -83,6 +82,12 @@ void apply( bool bToAll, bool bForceSlides ); void change( SdUndoGroup* pUndoGroup, SdPage* pPage, const HeaderFooterSettings& rNewSettings ); + /// The copy constructor is not implemented. Do not use! + HeaderFooterDialog (const HeaderFooterDialog&); + + /// The assignment operator is not implemented. Do not use! + HeaderFooterDialog& operator= (const HeaderFooterDialog&); + public: HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent, SdDrawDocument* pDoc, SdPage* pCurrentPage ); ~HeaderFooterDialog(); Index: sd/source/ui/inc/prltempl.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/prltempl.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prltempl.hxx --- sd/source/ui/inc/prltempl.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/prltempl.hxx 16 May 2007 21:03:03 -0000 @@ -101,6 +101,11 @@ using SfxTabDialog::GetOutputItemSet; + /// The copy constructor is not implemented. Do not use! + SdPresLayoutTemplateDlg (const SdPresLayoutTemplateDlg&); + /// The assignment operator is not implemented. Do not use! + SdPresLayoutTemplateDlg& operator= (const SdPresLayoutTemplateDlg&); + public: SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh, Window* pParent, SdResId DlgId, SfxStyleSheetBase& rStyleBase, PresentationObjects ePO, SfxStyleSheetBasePool* pSSPool ); ~SdPresLayoutTemplateDlg(); Index: sd/source/ui/inc/prntopts.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/prntopts.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 prntopts.hxx --- sd/source/ui/inc/prntopts.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/prntopts.hxx 16 May 2007 21:12:45 -0000 @@ -109,7 +109,7 @@ ~SdPrintOptions(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static const USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); Index: sd/source/ui/inc/sdpreslt.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/sdpreslt.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 sdpreslt.hxx --- sd/source/ui/inc/sdpreslt.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/sdpreslt.hxx 16 May 2007 20:12:47 -0000 @@ -76,6 +76,11 @@ DECL_LINK(ClickLoadHdl, void *); private: + /// The copy constructor is not implemented. Do not use! + SdPresLayoutDlg (const SdPresLayoutDlg&); + /// The assignment operator is not implemented. Do not use! + SdPresLayoutDlg& operator= (const SdPresLayoutDlg&); + ::sd::DrawDocShell* mpDocSh; ::sd::ViewShell* mpViewSh; FixedText maFtLayout; Index: sd/source/ui/inc/tpaction.hxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/inc/tpaction.hxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 tpaction.hxx --- sd/source/ui/inc/tpaction.hxx 17 Apr 2007 15:27:41 -0000 1.1.1.1 +++ sd/source/ui/inc/tpaction.hxx 16 May 2007 21:14:55 -0000 @@ -154,7 +154,7 @@ ~SdTPAction(); static SfxTabPage* Create( Window*, const SfxItemSet& ); - static USHORT* GetRanges(); + static const USHORT* GetRanges(); virtual BOOL FillItemSet( SfxItemSet& ); virtual void Reset( const SfxItemSet & ); Index: sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx =================================================================== RCS file: /home/cvsroot/OOo/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 SlsBitmapCache.cxx --- sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 17 Apr 2007 15:27:40 -0000 1.1.1.1 +++ sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx 16 May 2007 20:23:19 -0000 @@ -54,7 +54,7 @@ // previews that are currently not visible. The visible previews are all // held in memory at all times. This default is used only when the // configuration does not have a value. -static const sal_Int32 MAXIMAL_CACHE_SIZE = 4L*1024L*1024L; +static const sal_Int32 MAXIMAL_CACHE_SIZE(4L*1024L*1024L); using namespace ::com::sun::star::uno;