From 4798d3562cef044b988a5977bedcb8dd7e91ed9f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 10 Jul 2009 14:03:42 +0200 Subject: #i103452#: replace PRODUCT by !DBG_UTIL; replace assert by OSL_ASSERT where possible --- xmloff/inc/xmloff/ProgressBarHelper.hxx | 2 +- xmloff/inc/xmloff/xmlexp.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/xmloff/ProgressBarHelper.hxx b/xmloff/inc/xmloff/ProgressBarHelper.hxx index cb1ae3ab54..69badad606 100644 --- a/xmloff/inc/xmloff/ProgressBarHelper.hxx +++ b/xmloff/inc/xmloff/ProgressBarHelper.hxx @@ -52,7 +52,7 @@ class XMLOFF_DLLPUBLIC ProgressBarHelper // #96469#; if the value goes over the Range the progressbar starts again sal_Bool bRepeat; -#ifndef PRODUCT +#ifdef DBG_UTIL sal_Bool bFailure; #endif public: diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 6f660dce62..ffc08fa856 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -363,7 +363,7 @@ public: virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); // Check if common attribute list is empty. -#ifdef PRODUCT +#ifndef DBG_UTIL void CheckAttrList() {} #else void CheckAttrList(); -- cgit v1.2.3 From b06310548b2b1908ac9a03f225acae109a3af5c3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 6 Oct 2009 07:38:24 +0200 Subject: #103496#: move VCL free ConfigItems to unotools --- avmedia/source/viewer/mediawindow.cxx | 72 +++++------ basic/inc/pch/precompiled_basic.hxx | 4 +- basic/source/basmgr/basicmanagerrepository.cxx | 4 +- basic/source/basmgr/basmgr.cxx | 2 +- basic/source/uno/dlgcont.cxx | 42 +++---- basic/source/uno/namecont.cxx | 34 +++--- basic/source/uno/scriptcont.cxx | 14 +-- connectivity/source/drivers/calc/CConnection.cxx | 4 +- connectivity/source/drivers/calc/makefile.mk | 1 + connectivity/source/drivers/file/FConnection.cxx | 4 +- desktop/source/app/app.cxx | 26 ++-- desktop/source/app/appinit.cxx | 30 ++--- desktop/source/app/langselect.cxx | 28 ++--- desktop/source/app/officeipcthread.cxx | 4 +- desktop/source/migration/pages.cxx | 16 +-- fpicker/source/office/OfficeFilePicker.cxx | 12 +- fpicker/source/office/OfficeFolderPicker.cxx | 4 +- fpicker/source/office/iodlg.cxx | 8 +- fpicker/source/office/iodlgimp.cxx | 8 +- framework/inc/dispatch/basedispatcher.hxx | 4 +- framework/inc/helper/persistentwindowstate.hxx | 48 ++++---- framework/inc/helper/titlebarupdate.hxx | 34 +++--- framework/inc/pch/precompiled_framework.hxx | 12 +- framework/inc/services/desktop.hxx | 70 +++++------ framework/inc/services/frame.hxx | 8 +- framework/inc/services/pluginframe.hxx | 6 +- framework/source/classes/bmkmenu.cxx | 6 +- framework/source/classes/menumanager.cxx | 42 +++---- framework/source/dispatch/closedispatcher.cxx | 20 +-- .../source/dispatch/startmoduledispatcher.cxx | 4 +- framework/source/layoutmanager/layoutmanager.cxx | 18 +-- framework/source/loadenv/loadenv.cxx | 22 ++-- framework/source/services/autorecovery.cxx | 22 ++-- framework/source/services/backingwindow.cxx | 120 +++++++++--------- framework/source/services/backingwindow.hxx | 42 +++---- framework/source/services/frame.cxx | 10 +- framework/source/services/sessionlistener.cxx | 30 ++--- framework/source/uielement/menubarmanager.cxx | 12 +- framework/source/uielement/newmenucontroller.cxx | 44 +++---- .../source/uielement/recentfilesmenucontroller.cxx | 52 ++++---- framework/source/uielement/toolbarmanager.cxx | 8 +- .../source/uielement/toolbarsmenucontroller.cxx | 48 ++++---- linguistic/inc/lngprops.hxx | 36 +++--- linguistic/inc/misc.hxx | 26 ++-- linguistic/source/convdiclist.cxx | 134 ++++++++++----------- linguistic/source/dlistimp.cxx | 28 ++--- linguistic/source/lngopt.cxx | 10 +- linguistic/source/lngopt.hxx | 6 +- linguistic/source/lngsvcmgr.cxx | 20 +-- linguistic/source/misc.cxx | 16 +-- linguistic/source/misc2.cxx | 40 +++--- sfx2/inc/pch/precompiled_sfx2.hxx | 42 +++---- sfx2/inc/sfx2/event.hxx | 4 +- sfx2/source/appl/app.cxx | 31 +++-- sfx2/source/appl/appbas.cxx | 8 +- sfx2/source/appl/appcfg.cxx | 12 +- sfx2/source/appl/appdde.cxx | 4 +- sfx2/source/appl/appinit.cxx | 14 +-- sfx2/source/appl/appmain.cxx | 4 +- sfx2/source/appl/appmisc.cxx | 8 +- sfx2/source/appl/appopen.cxx | 6 +- sfx2/source/appl/appquit.cxx | 4 +- sfx2/source/appl/appserv.cxx | 8 +- sfx2/source/appl/childwin.cxx | 4 +- sfx2/source/appl/newhelp.cxx | 12 +- sfx2/source/appl/newhelp.hxx | 4 +- sfx2/source/appl/sfxhelp.cxx | 4 +- sfx2/source/appl/sfxpicklist.cxx | 6 +- sfx2/source/appl/shutdowniconOs2.cxx | 12 +- sfx2/source/appl/shutdowniconunx.cxx | 8 +- sfx2/source/appl/shutdowniconw32.cxx | 10 +- sfx2/source/bastyp/fltfnc.cxx | 6 +- sfx2/source/config/evntconf.cxx | 2 +- sfx2/source/control/shell.cxx | 4 +- sfx2/source/control/srchitem.cxx | 2 +- sfx2/source/dialog/alienwarn.cxx | 2 +- sfx2/source/dialog/basedlgs.cxx | 2 +- sfx2/source/dialog/dinfdlg.cxx | 4 +- sfx2/source/dialog/filedlghelper.cxx | 8 +- sfx2/source/dialog/intro.cxx | 4 +- sfx2/source/dialog/mailmodel.cxx | 102 ++++++++-------- sfx2/source/dialog/mailmodelapi.cxx | 28 ++--- sfx2/source/dialog/printopt.cxx | 2 +- sfx2/source/dialog/splitwin.cxx | 4 +- sfx2/source/dialog/srchdlg.cxx | 4 +- sfx2/source/dialog/tabdlg.cxx | 2 +- sfx2/source/dialog/versdlg.cxx | 4 +- sfx2/source/doc/applet.cxx | 14 +-- sfx2/source/doc/docfac.cxx | 6 +- sfx2/source/doc/docfile.cxx | 38 +++--- sfx2/source/doc/docmacromode.cxx | 4 +- sfx2/source/doc/doctempl.cxx | 4 +- sfx2/source/doc/doctemplates.cxx | 4 +- sfx2/source/doc/docvor.cxx | 6 +- sfx2/source/doc/guisaveas.cxx | 16 +-- sfx2/source/doc/objcont.cxx | 6 +- sfx2/source/doc/objmisc.cxx | 8 +- sfx2/source/doc/objserv.cxx | 18 +-- sfx2/source/doc/objstor.cxx | 15 ++- sfx2/source/doc/objxtor.cxx | 8 +- sfx2/source/inc/eventsupplier.hxx | 48 ++++---- sfx2/source/inc/objshimp.hxx | 4 +- sfx2/source/inet/inettbc.cxx | 4 +- sfx2/source/layout/sfxtabdialog.cxx | 4 +- sfx2/source/menu/mnumgr.cxx | 2 +- sfx2/source/notify/eventsupplier.cxx | 44 +++---- sfx2/source/toolbox/tbxitem.cxx | 6 +- sfx2/source/view/frmload.cxx | 4 +- sfx2/source/view/printer.cxx | 4 +- sfx2/source/view/prnmon.cxx | 4 +- sfx2/source/view/topfrm.cxx | 6 +- sfx2/source/view/viewfrm.cxx | 10 +- sfx2/source/view/viewprn.cxx | 8 +- sfx2/source/view/viewsh.cxx | 54 ++++----- svx/inc/pch/precompiled_svx.hxx | 48 ++++---- svx/source/cui/SpellDialog.cxx | 36 +++--- svx/source/cui/backgrnd.cxx | 4 +- svx/source/cui/chardlg.cxx | 2 +- svx/source/cui/cuigaldlg.cxx | 4 +- svx/source/cui/cuihyperdlg.cxx | 4 +- svx/source/cui/cuisrchdlg.cxx | 4 +- svx/source/cui/dbregisterednamesconfig.cxx | 6 +- svx/source/cui/eventdlg.cxx | 10 +- svx/source/cui/fontsubs.cxx | 6 +- svx/source/cui/fontsubs.hxx | 9 +- svx/source/cui/hangulhanjadlg.cxx | 20 +-- svx/source/cui/hldocntp.cxx | 6 +- svx/source/cui/hlinettp.cxx | 6 +- svx/source/cui/hlmailtp.cxx | 12 +- svx/source/cui/iconcdlg.cxx | 4 +- svx/source/cui/multipat.cxx | 4 +- svx/source/cui/numpages.cxx | 4 +- svx/source/cui/optchart.cxx | 4 +- svx/source/cui/optcolor.cxx | 10 +- svx/source/cui/optfltr.cxx | 6 +- svx/source/cui/optgdlg.cxx | 34 +++--- svx/source/cui/optgenrl.cxx | 4 +- svx/source/cui/optinet2.cxx | 10 +- svx/source/cui/optjava.cxx | 4 +- svx/source/cui/optjsearch.cxx | 4 +- svx/source/cui/optmemory.cxx | 14 +-- svx/source/cui/optpath.cxx | 18 +-- svx/source/cui/optsave.cxx | 8 +- svx/source/cui/postdlg.cxx | 4 +- svx/source/cui/securityoptions.cxx | 4 +- svx/source/cui/tabarea.cxx | 4 +- svx/source/cui/tabline.cxx | 6 +- svx/source/cui/tpbitmap.cxx | 6 +- svx/source/cui/tpcolor.cxx | 10 +- svx/source/cui/tpgradnt.cxx | 8 +- svx/source/cui/tphatch.cxx | 6 +- svx/source/cui/tplnedef.cxx | 6 +- svx/source/cui/tplneend.cxx | 4 +- svx/source/cui/treeopt.cxx | 8 +- svx/source/dialog/docrecovery.cxx | 2 +- svx/source/dialog/hangulhanja.cxx | 4 +- svx/source/dialog/hyperdlg.cxx | 4 +- svx/source/dialog/hyprlink.cxx | 30 ++--- svx/source/dialog/imapdlg.cxx | 6 +- svx/source/dialog/impgrf.cxx | 6 +- svx/source/dialog/opengrf.cxx | 4 +- svx/source/dialog/srchdlg.cxx | 2 +- svx/source/dialog/svxbmpnumvalueset.cxx | 8 +- svx/source/editeng/acorrcfg.cxx | 6 +- svx/source/editeng/editview.cxx | 14 +-- svx/source/editeng/unolingu.cxx | 8 +- svx/source/form/datanavi.cxx | 26 ++-- svx/source/form/fmshell.cxx | 4 +- svx/source/form/fmview.cxx | 16 +-- svx/source/form/fmvwimp.cxx | 6 +- svx/source/gallery2/galbrws.cxx | 18 +-- svx/source/gallery2/galexpl.cxx | 32 ++--- svx/source/gallery2/gallery1.cxx | 32 ++--- svx/source/gallery2/galobj.cxx | 26 ++-- svx/source/options/optlingu.cxx | 4 +- svx/source/svdraw/svdetc.cxx | 54 ++++----- svx/source/tbxctrls/tbcontrl.cxx | 10 +- .../chinese_dictionarydialog.cxx | 46 +++---- .../chinese_translationdialog.cxx | 10 +- svx/source/unodraw/unoctabl.cxx | 12 +- svx/source/unogallery/unogaltheme.cxx | 126 +++++++++---------- svx/source/unogallery/unogalthemeprovider.cxx | 80 ++++++------ svx/source/xoutdev/xtabcolr.cxx | 4 +- uui/source/secmacrowarnings.hxx | 4 +- xmloff/inc/pch/precompiled_xmloff.hxx | 4 +- xmloff/inc/xmloff/maptype.hxx | 4 +- xmloff/inc/xmloff/xmlexp.hxx | 4 +- .../source/chart/XMLErrorBarStylePropertyHdl.cxx | 6 +- 188 files changed, 1523 insertions(+), 1519 deletions(-) (limited to 'xmloff/inc') diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx index f6ca9f0d75..4cf91bd3d1 100644 --- a/avmedia/source/viewer/mediawindow.cxx +++ b/avmedia/source/viewer/mediawindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,15 +28,15 @@ * ************************************************************************/ -#include - +#include + #include #include "mediawindow_impl.hxx" #include "mediamisc.hxx" #include "mediawindow.hrc" #include #include -#include +#include #include #include #include @@ -77,7 +77,7 @@ void MediaWindow::setURL( const ::rtl::OUString& rURL ) } // ------------------------------------------------------------------------- - + const ::rtl::OUString& MediaWindow::getURL() const { return mpImpl->getURL(); @@ -378,11 +378,11 @@ void MediaWindow::getMediaFilters( FilterNameVector& rFilterNameVector ) "Quicktime Video", "mov", "Vivo Video", "viv", "WAVE Audio", "wav" }; - + unsigned int i; for( i = 0; i < ( sizeof( pFilters ) / sizeof( char* ) ); i += 2 ) { - rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >( + rFilterNameVector.push_back( ::std::make_pair< ::rtl::OUString, ::rtl::OUString >( ::rtl::OUString::createFromAscii( pFilters[ i ] ), ::rtl::OUString::createFromAscii( pFilters[ i + 1 ] ) ) ); } @@ -397,9 +397,9 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString& FilterNameVector aFilters; const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) ); ::rtl::OUString aAllTypes; - + aDlg.SetTitle( AVMEDIA_RESID( bInsertDialog ? AVMEDIA_STR_INSERTMEDIA_DLG : AVMEDIA_STR_OPENMEDIA_DLG ) ); - + getMediaFilters( aFilters ); unsigned int i; @@ -409,33 +409,33 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString& { if( aAllTypes.getLength() ) aAllTypes += aSeparator; - + ( aAllTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex ); } } - + // add filter for all media types aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_MEDIAFILES ), aAllTypes ); - + for( i = 0; i < aFilters.size(); ++i ) { ::rtl::OUString aTypes; - + for( sal_Int32 nIndex = 0; nIndex >= 0; ) { if( aTypes.getLength() ) aTypes += aSeparator; - + ( aTypes += aWildcard ) += aFilters[ i ].second.getToken( 0, ';', nIndex ); } - + // add single filters aDlg.AddFilter( aFilters[ i ].first, aTypes ); } // add filter for all types aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) ); - + if( aDlg.Execute() == ERRCODE_NONE ) { const INetURLObject aURL( aDlg.GetPath() ); @@ -452,7 +452,7 @@ bool MediaWindow::executeMediaURLDialog( Window* /* pParent */, ::rtl::OUString& void MediaWindow::executeFormatErrorBox( Window* pParent ) { ErrorBox aErrBox( pParent, AVMEDIA_RESID( AVMEDIA_ERR_URL ) ); - + aErrBox.Execute(); } @@ -462,35 +462,35 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr { const INetURLObject aURL( rURL ); bool bRet = false; - + if( aURL.GetProtocol() != INET_PROT_NOT_VALID ) { if( bDeep || pPreferredSizePixel ) { uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); - + if( xFactory.is() ) { try { fprintf(stderr, "-->%s uno reference \n\n",AVMEDIA_MANAGER_SERVICE_NAME); - + uno::Reference< ::com::sun::star::media::XManager > xManager( xFactory->createInstance( ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ), uno::UNO_QUERY ); - + if( xManager.is() ) { uno::Reference< media::XPlayer > xPlayer( xManager->createPlayer( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ) ); - + if( xPlayer.is() ) { bRet = true; - + if( pPreferredSizePixel ) { const awt::Size aAwtSize( xPlayer->getPreferredPlayerWindowSize() ); - + pPreferredSizePixel->Width() = aAwtSize.Width; pPreferredSizePixel->Height() = aAwtSize.Height; } @@ -506,7 +506,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr { FilterNameVector aFilters; const ::rtl::OUString aExt( aURL.getExtension() ); - + getMediaFilters( aFilters ); unsigned int i; @@ -520,7 +520,7 @@ bool MediaWindow::isMediaURL( const ::rtl::OUString& rURL, bool bDeep, Size* pPr } } } - + return bRet; } @@ -532,7 +532,7 @@ uno::Reference< media::XPlayer > MediaWindow::createPlayer( const ::rtl::OUStrin } // ------------------------------------------------------------------------- - + uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUString& rURL, bool bAllowToCreateReplacementGraphic, double fMediaTime ) @@ -540,26 +540,26 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin uno::Reference< media::XPlayer > xPlayer( createPlayer( rURL ) ); uno::Reference< graphic::XGraphic > xRet; ::std::auto_ptr< Graphic > apGraphic; - + if( xPlayer.is() ) { uno::Reference< media::XFrameGrabber > xGrabber( xPlayer->createFrameGrabber() ); - + if( xGrabber.is() ) { if( AVMEDIA_FRAMEGRABBER_DEFAULTFRAME == fMediaTime ) fMediaTime = AVMEDIA_FRAMEGRABBER_DEFAULTFRAME_MEDIATIME; - + if( fMediaTime >= xPlayer->getDuration() ) fMediaTime = ( xPlayer->getDuration() * 0.5 ); - + xRet = xGrabber->grabFrame( fMediaTime ); } - + if( !xRet.is() && bAllowToCreateReplacementGraphic ) { awt::Size aPrefSize( xPlayer->getPreferredPlayerWindowSize() ); - + if( !aPrefSize.Width && !aPrefSize.Height ) { const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_AUDIOLOGO ) ); @@ -567,16 +567,16 @@ uno::Reference< graphic::XGraphic > MediaWindow::grabFrame( const ::rtl::OUStrin } } } - + if( !xRet.is() && !apGraphic.get() && bAllowToCreateReplacementGraphic ) { const BitmapEx aBmpEx( AVMEDIA_RESID( AVMEDIA_BMP_EMPTYLOGO ) ); apGraphic.reset( new Graphic( aBmpEx ) ); } - + if( apGraphic.get() ) xRet = apGraphic->GetXGraphic(); - + return xRet; } diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index cd10ee53f3..0a0ee33fd9 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -180,7 +180,7 @@ #include "svtools/filedlg.hxx" #include "svtools/hint.hxx" #include "svtools/lstner.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/smplhint.hxx" #include "svtools/solar.hrc" diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 3c4980e266..2340c73269 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ /** === end UNO includes === **/ #include #include -#include +#include #include #include #include diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 9c690f1c8d..e357d5828f 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index ba67d5bfa5..2ed3a5ca1f 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ #include #include -#include +#include #include #include #include @@ -104,7 +104,7 @@ SfxLibrary* SfxDialogLibraryContainer::implCreateLibrary( const ::rtl::OUString& } SfxLibrary* SfxDialogLibraryContainer::implCreateLibraryLink - ( const ::rtl::OUString& aName, const OUString& aLibInfoFileURL, + ( const ::rtl::OUString& aName, const OUString& aLibInfoFileURL, const OUString& StorageURL, sal_Bool ReadOnly ) { SfxLibrary* pRet = new SfxDialogLibrary @@ -144,7 +144,7 @@ bool writeOasis2OOoLibraryElement( { return FALSE; } - + Reference< xml::sax::XParser > xParser( xSMgr->createInstanceWithContext( OUString( RTL_CONSTASCII_USTRINGPARAM( @@ -166,7 +166,7 @@ bool writeOasis2OOoLibraryElement( { return FALSE; } - + Sequence aArgs( 1 ); aArgs[0] <<= xWriter; @@ -178,20 +178,20 @@ bool writeOasis2OOoLibraryElement( UNO_QUERY ); xParser->setDocumentHandler( xHandler ); - + xml::sax::InputSource source; source.aInputStream = xInput; source.sSystemId = OUString::createFromAscii( "virtual file" ); - + xParser->parseStream( source ); return TRUE; } void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement -( +( Any aElement, - const OUString& /*aElementName*/, + const OUString& /*aElementName*/, Reference< XOutputStream > xOutput ) throw(Exception) @@ -319,9 +319,9 @@ Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement InputSource source; source.aInputStream = xInput; source.sSystemId = aFile; - + try { - // start parsing + // start parsing xParser->setDocumentHandler( ::xmlscript::importDialogModel( xDialogModel, xContext ) ); xParser->parseStream( source ); } @@ -356,7 +356,7 @@ static OUString aResourceFileNameBase = OUString::createFromAscii( "DialogString static OUString aResourceFileCommentBase = OUString::createFromAscii( "# Strings for Dialog Library " ); // Resource handling -Reference< ::com::sun::star::resource::XStringResourcePersistence > +Reference< ::com::sun::star::resource::XStringResourcePersistence > SfxDialogLibraryContainer::implCreateStringResource( SfxDialogLibrary* pDialogLibrary ) { Reference< resource::XStringResourcePersistence > xRet; @@ -528,7 +528,7 @@ OUString SfxDialogLibraryContainer::getImplementationName_static() Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Reference< XComponentContext >& ) throw( Exception ) { - Reference< XInterface > xRet = + Reference< XInterface > xRet = static_cast< XInterface* >( static_cast< OWeakObject* >(new SfxDialogLibraryContainer()) ); return xRet; } @@ -540,8 +540,8 @@ Reference< XInterface > SAL_CALL SfxDialogLibraryContainer::Create( const Refere // Ctor SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const ::rtl::OUString& aName, - const Reference< XMultiServiceFactory >& xMSF, - const Reference< XSimpleFileAccess >& xSFI, + const Reference< XMultiServiceFactory >& xMSF, + const Reference< XSimpleFileAccess >& xSFI, SfxDialogLibraryContainer* pParent ) : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), xMSF, xSFI ) , m_pParent( pParent ) @@ -551,10 +551,10 @@ SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, SfxDialogLibrary::SfxDialogLibrary( ModifiableHelper& _rModifiable, const ::rtl::OUString& aName, - const Reference< XMultiServiceFactory >& xMSF, - const Reference< XSimpleFileAccess >& xSFI, - const OUString& aLibInfoFileURL, - const OUString& aStorageURL, + const Reference< XMultiServiceFactory >& xMSF, + const Reference< XSimpleFileAccess >& xSFI, + const OUString& aLibInfoFileURL, + const OUString& aStorageURL, sal_Bool ReadOnly, SfxDialogLibraryContainer* pParent ) : SfxLibrary( _rModifiable, getCppuType( (const Reference< XInputStreamProvider > *)0 ), @@ -603,7 +603,7 @@ void SfxDialogLibrary::storeResourcesAsURL } } -void SfxDialogLibrary::storeResourcesToURL( const OUString& URL, +void SfxDialogLibrary::storeResourcesToURL( const OUString& URL, const Reference< task::XInteractionHandler >& xHandler ) { OUString aComment = aResourceFileCommentBase; @@ -631,7 +631,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const ::com::sun::star::uno::Ref // XStringResourceSupplier -Reference< resource::XStringResourceResolver > +Reference< resource::XStringResourceResolver > SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException) { if( !m_xStringResourcePersistence.is() ) diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index c15d937f9b..8c89be33c5 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include @@ -101,7 +101,7 @@ using namespace osl; using com::sun::star::uno::Reference; -// #i34411: Flag for error handling during migration +// #i34411: Flag for error handling during migration static bool GbMigrationSuppressErrors = false; //============================================================================ @@ -1271,28 +1271,28 @@ SfxLibrary* SfxLibraryContainer::getImplLib( const String& rLibraryName ) // Storing with password encryption // Empty implementation, avoids unneccesary implementation in dlgcont.cxx -sal_Bool SfxLibraryContainer::implStorePasswordLibrary( +sal_Bool SfxLibraryContainer::implStorePasswordLibrary( SfxLibrary*, - const OUString&, + const OUString&, const uno::Reference< embed::XStorage >&, const uno::Reference< task::XInteractionHandler >& ) { return sal_False; } -sal_Bool SfxLibraryContainer::implStorePasswordLibrary( - SfxLibrary* /*pLib*/, - const ::rtl::OUString& /*aName*/, +sal_Bool SfxLibraryContainer::implStorePasswordLibrary( + SfxLibrary* /*pLib*/, + const ::rtl::OUString& /*aName*/, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& /*xStorage*/, - const ::rtl::OUString& /*aTargetURL*/, + const ::rtl::OUString& /*aTargetURL*/, const Reference< XSimpleFileAccess > /*xToUseSFI*/, const uno::Reference< task::XInteractionHandler >& ) { return sal_False; } -sal_Bool SfxLibraryContainer::implLoadPasswordLibrary( - SfxLibrary* /*pLib*/, - const OUString& /*Name*/, +sal_Bool SfxLibraryContainer::implLoadPasswordLibrary( + SfxLibrary* /*pLib*/, + const OUString& /*Name*/, sal_Bool /*bVerifyPasswordOnly*/ ) throw(WrappedTargetException, RuntimeException) { @@ -2000,7 +2000,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto Reference< XActiveDataSource > xSource( xHandler, UNO_QUERY ); xSource->setOutputStream( xOut ); - try + try { xmlscript::exportLibraryContainer( xHandler, pLibArray ); if ( bStorage ) @@ -2602,7 +2602,7 @@ sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword throw IllegalArgumentException(); } -void SAL_CALL SfxLibraryContainer::changeLibraryPassword( +void SAL_CALL SfxLibraryContainer::changeLibraryPassword( const OUString&, const OUString&, const OUString& ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { @@ -2627,8 +2627,8 @@ void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XCo } // Methods XLibraryContainerExport -void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL, - const Reference< XInteractionHandler >& Handler ) +void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL, + const Reference< XInteractionHandler >& Handler ) throw ( uno::Exception, NoSuchElementException, RuntimeException) { LibraryContainerMethodGuard aGuard( *this ); @@ -3051,7 +3051,7 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia case SHARED_EXTENSIONS: { - Reference< deployment::XPackage > xScriptPackage = + Reference< deployment::XPackage > xScriptPackage = implGetNextSharedScriptPackage( rbPureDialogLib ); if( !xScriptPackage.is() ) break; diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 2d7d8e8fc2..c744e6bc2f 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include -#include +#include #include #include #include @@ -162,7 +162,7 @@ SfxLibrary* SfxScriptLibraryContainer::implCreateLibrary( const OUString& aName } SfxLibrary* SfxScriptLibraryContainer::implCreateLibraryLink - ( const OUString& aName, const OUString& aLibInfoFileURL, + ( const OUString& aName, const OUString& aLibInfoFileURL, const OUString& StorageURL, sal_Bool ReadOnly ) { (void)aName; // Only needed for SfxDialogLibrary @@ -495,7 +495,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, return implStorePasswordLibrary( pLib, aName, xStorage, aDummyLocation, xDummySFA, xHandler ); } -sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, +sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage, const ::rtl::OUString& aTargetURL, const Reference< XSimpleFileAccess > xToUseSFI, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& xHandler ) { @@ -506,7 +506,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, if ( !pBasicMgr ) return sal_False; - // Only need to handle the export case here, + // Only need to handle the export case here, // save/saveas etc are handled in sfxbasemodel::storeSelf & // sfxbasemodel::impl_store uno::Sequence aNames; @@ -516,7 +516,7 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, { ModuleSizeExceeded* pReq = new ModuleSizeExceeded( aNames ); uno::Reference< task::XInteractionRequest > xReq( pReq ); - xHandler->handle( xReq ); + xHandler->handle( xReq ); if ( pReq->isAbort() ) throw util::VetoException(); } @@ -1136,7 +1136,7 @@ void SfxScriptLibrary::storeResources( void ) // No resources } -void SfxScriptLibrary::storeResourcesToURL( const ::rtl::OUString& URL, +void SfxScriptLibrary::storeResourcesToURL( const ::rtl::OUString& URL, const Reference< task::XInteractionHandler >& Handler ) { (void)URL; diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index a515c9ddb3..b4a1a71410 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include #include "calc/CPreparedStatement.hxx" #include "calc/CStatement.hxx" -#include +#include #include #include #include diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index 620bcd6a8e..f4019564ed 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -73,6 +73,7 @@ SHL1STDLIBS=\ $(VOSLIB) \ $(SVLLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(SALLIB) \ $(DBTOOLSLIB) \ $(DBFILELIB) \ diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index 1894e34d91..5ec55bd4ee 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include #include #include "file/FCatalog.hxx" -#include +#include #include #include #include diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index a68c043390..0e09b8b87d 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,14 +114,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -149,7 +149,7 @@ #include #include #include -#include +#include #include "langselect.hxx" @@ -1397,10 +1397,10 @@ void Desktop::Main() if ( ! pCmdLineArgs->IsNoFirstStartWizard()) { RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ FirstStartWizard" ); - + if (IsFirstStartWizardNeeded()) { - ::svt::RegOptions().removeReminder(); // remove patch registration reminder + ::utl::RegOptions().removeReminder(); // remove patch registration reminder Reference< XJob > xFirstStartJob( xSMgr->createInstance( DEFINE_CONST_UNICODE( "com.sun.star.comp.desktop.FirstStart" ) ), UNO_QUERY ); if (xFirstStartJob.is()) @@ -1411,7 +1411,7 @@ void Desktop::Main() lArgs[0].Value <<= LicenseNeedsAcceptance(); lArgs[1].Name = ::rtl::OUString::createFromAscii("LicensePath"); lArgs[1].Value <<= GetLicensePath(); - + xFirstStartJob->execute(lArgs) >>= bDone; if ( !bDone ) { @@ -1421,7 +1421,7 @@ void Desktop::Main() } else if ( RegistrationPage::hasReminderDateCome() ) RegistrationPage::executeSingleMode(); - + RTL_LOGFILE_CONTEXT_TRACE( aLog, "} FirstStartWizard" ); } @@ -2472,7 +2472,7 @@ void Desktop::OpenClients() } } } - + OfficeIPCThread::EnableRequests(); sal_Bool bShutdown( sal_False ); @@ -2809,11 +2809,11 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > xDesktop( xSMGR->createInstance( OUSTRING(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Desktop")) ), ::com::sun::star::uno::UNO_QUERY ); - + // check provider ... we know it's weak reference only if ( ! xDesktop.is()) return; - + css::uno::Reference< css::util::XURLTransformer > xParser(xSMGR->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), css::uno::UNO_QUERY_THROW); css::util::URL aCommand; if( rAppEvent.GetData().EqualsAscii( "PREFERENCES" ) ) @@ -2823,7 +2823,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) if( aCommand.Complete.getLength() ) { xParser->parseStrict(aCommand); - + css::uno::Reference< css::frame::XDispatch > xDispatch = xDesktop->queryDispatch(aCommand, rtl::OUString(), 0); if (xDispatch.is()) xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >()); diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index a477eb2ad4..94bd3c55b3 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,9 +75,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define DEFINE_CONST_OUSTRING(CONSTASCII) OUString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII)) @@ -131,7 +131,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) aArgs[4] <<= rtl::OUString::createFromAscii("PORTAL"); aArgs[5] <<= aPortal.makeStringAndClear(); - bool ret = + bool ret = ::ucbhelper::ContentBroker::initialize( xServiceFactory, aArgs ) != false; #ifdef GNOME_VFS_ENABLED @@ -178,7 +178,7 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) // Workaround for P1 #124597#. Instanciate GNOME-VFS-UCP in the thread that initialized // GNOME in order to avoid a deadlock that may occure in case UCP gets initialized from - // a different thread. The latter may happen when calling the Office remotely via UNO. + // a different thread. The latter may happen when calling the Office remotely via UNO. // THIS IS NOT A FIX, JUST A WORKAROUND! try @@ -201,16 +201,16 @@ static bool configureUcb(bool bServer, rtl::OUString const & rPortalConnect) } } catch (RuntimeException e) { } - } + } #endif // GNOME_VFS_ENABLED - + return ret;; } Reference< XMultiServiceFactory > Desktop::CreateApplicationServiceManager() { RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" ); - + try { Reference xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); @@ -332,7 +332,7 @@ void Desktop::createAcceptor(const OUString& aAcceptString) Sequence< Any > aSeq( 2 ); aSeq[0] <<= aAcceptString; aSeq[1] <<= bAccept; - Reference rAcceptor( + Reference rAcceptor( ::comphelper::getProcessServiceFactory()->createInstance( OUString::createFromAscii( "com.sun.star.office.Acceptor" )), UNO_QUERY ); if ( rAcceptor.is() ) { @@ -366,7 +366,7 @@ class enable } } }; - + void Desktop::enableAcceptors() { RTL_LOGFILE_CONTEXT(aLog, "desktop (lo119109) Desktop::enableAcceptors"); @@ -389,14 +389,14 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString) AcceptorMap &rMap = acceptorMap::get(); if (aAcceptString.compareToAscii("all") == 0) { rMap.clear(); - + } else { // try to remove acceptor from map AcceptorMap::const_iterator pIter = rMap.find(aAcceptString); if (pIter != rMap.end() ) { // remove reference from map // this is the last reference and the acceptor will be destructed - rMap.erase(aAcceptString); + rMap.erase(aAcceptString); } else { OSL_ENSURE(sal_False, "Found no acceptor to remove"); } @@ -407,7 +407,7 @@ void Desktop::destroyAcceptor(const OUString& aAcceptString) void Desktop::DeregisterServices() { // stop all acceptors by clearing the map - acceptorMap::get().clear(); + acceptorMap::get().clear(); } void Desktop::CreateTemporaryDirectory() @@ -434,7 +434,7 @@ void Desktop::CreateTemporaryDirectory() e.Message = aMsg + e.Message; throw e; } - + // remove possible old directory and base directory SvtInternalOptions aInternalOpt; diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 2ad0b382e4..114997b5d1 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include #endif #ifndef _SVTOOLS_PATHOPTIONS_HXX -#include +#include #endif #include #include @@ -84,7 +84,7 @@ bool LanguageSelection::prepareLanguage() OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider"); Reference< XMultiServiceFactory > theMSF = comphelper::getProcessServiceFactory(); Reference< XLocalizable > theConfigProvider; - try + try { theConfigProvider = Reference< XLocalizable >(theMSF->createInstance( sConfigSrvc ),UNO_QUERY_THROW ); } @@ -95,7 +95,7 @@ bool LanguageSelection::prepareLanguage() return false; sal_Bool bSuccess = sal_False; - + // #i42730#get the windows 16Bit locale - it should be preferred over the UI language try { @@ -109,17 +109,17 @@ bool LanguageSelection::prepareLanguage() catch(const Exception&) { } - + // #i32939# use system locale to set document default locale - try + try { OUString usLocale; Reference< XPropertySet > xLocaleProp(getConfigAccess( "org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW); - xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale; + xLocaleProp->getPropertyValue(OUString::createFromAscii("Locale")) >>= usLocale; setDefaultLanguage(usLocale); - } - catch (Exception&) + } + catch (Exception&) { } // get the selected UI language as string @@ -138,7 +138,7 @@ bool LanguageSelection::prepareLanguage() Reference< XFlushable >(theConfigProvider, UNO_QUERY_THROW)-> flush(); theConfigProvider->setLocale(loc); - + Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Setup/L10N/", sal_True), UNO_QUERY_THROW); xProp->setPropertyValue(OUString::createFromAscii("ooLocale"), makeAny(aLocaleString)); Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges(); @@ -289,7 +289,7 @@ static Sequence< OUString > _getFallbackLocales(const OUString& aIsoLang) if (aIsoLang.equalsAscii("zh-HK")) { seqFallbacks = Sequence< OUString >(1); seqFallbacks[0] = OUString::createFromAscii("zh-TW"); - } + } return seqFallbacks; } @@ -305,8 +305,8 @@ sal_Bool LanguageSelection::isInstalledLanguage(OUString& usLocale, sal_Bool bEx break; } } - - if (!bInstalled && !bExact) + + if (!bInstalled && !bExact) { // try fallback locales Sequence< OUString > seqFallbacks = _getFallbackLocales(usLocale); @@ -330,7 +330,7 @@ sal_Bool LanguageSelection::isInstalledLanguage(OUString& usLocale, sal_Bool bEx OUString aInstalledLocale; for (sal_Int32 i=0; i #include #include -#include +#include #include #include #include diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx index b430e235c0..efdf4caaf3 100644 --- a/desktop/source/migration/pages.cxx +++ b/desktop/source/migration/pages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -334,7 +334,7 @@ MigrationPage::MigrationPage( svt::OWizardMachine* parent, const ResId& resid) sal_Bool MigrationPage::commitPage( CommitPageReason _eReason ) { if (_eReason == eTravelForward && m_cbMigration.IsChecked() && !m_bMigrationDone) - { + { EnterWait(); Migration::doMigration(); LeaveWait(); @@ -419,7 +419,7 @@ UpdateCheckPage::UpdateCheckPage( svt::OWizardMachine* parent, const ResId& resi sal_Bool UpdateCheckPage::commitPage( CommitPageReason _eReason ) { if ( _eReason == eTravelForward ) - { + { try { Reference < XNameReplace > xUpdateAccess; Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); @@ -546,7 +546,7 @@ sal_Bool RegistrationPage::commitPage( CommitPageReason _eReason ) { if ( _eReason == eFinish ) { - ::svt::RegOptions aOptions; + ::utl::RegOptions aOptions; rtl::OUString aEvent; if ( m_rbNow.IsChecked()) @@ -603,7 +603,7 @@ void RegistrationPage::prepareSingleMode() bool RegistrationPage::hasReminderDateCome() { - return ::svt::RegOptions().hasReminderDateCome(); + return ::utl::RegOptions().hasReminderDateCome(); } void RegistrationPage::executeSingleMode() @@ -620,7 +620,7 @@ void RegistrationPage::executeSingleMode() if ( eMode == RegistrationPage::rmNow || eMode == RegistrationPage::rmLater ) pPage->commitPage( IWizardPage::eFinish ); if ( eMode != RegistrationPage::rmLater ) - ::svt::RegOptions().removeReminder(); + ::utl::RegOptions().removeReminder(); } // ----------------------------------------------------------------------- diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 916b7bccf8..d357c618b3 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include "vos/mutex.hxx" @@ -1057,7 +1057,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) throw ( Exception, RuntimeException ) { checkAlive(); - + Sequence< Any > aArguments( _rArguments.getLength()); m_nServiceType = TemplateDescription::FILEOPEN_SIMPLE; @@ -1073,7 +1073,7 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) NamedValue emptyNamedValue; aArguments[0] <<= emptyNamedValue; index = 1; - + } for ( int i = index; i < _rArguments.getLength(); i++) { @@ -1086,9 +1086,9 @@ void SAL_CALL SvtFilePicker::initialize( const Sequence< Any >& _rArguments ) if ( namedValue.Name.equals( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ) ) ) { ::rtl::OUString sStandardDir; - + namedValue.Value >>= sStandardDir; - + // Set the directory for the "back to the default dir" button if ( sStandardDir.getLength() > 0 ) { diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index 090aed73b0..b6d04b0190 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include #include #include -#include +#include // using ---------------------------------------------------------------- diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 00e714106e..c2dd487bde 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,10 +45,10 @@ #include #include "svtools/ehdl.hxx" #include "svtools/urihelper.hxx" -#include "svtools/pathoptions.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/pathoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" -#include "svtools/inetoptions.hxx" +#include "unotools/inetoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/svarray.hxx" #include "svtools/svtabbx.hxx" diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index f3b768ac53..1db6c7eb64 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ // #97148# --------------- #include "svtools/ctypeitm.hxx" #include "svtools/eitem.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "svtools/inettbc.hxx" #include "iodlg.hxx" @@ -54,7 +54,7 @@ #endif #include "svtools/imagemgr.hxx" #include -#include "svtools/useroptions.hxx" +#include "unotools/useroptions.hxx" #ifndef _RTL_INSTANCE_HXX_ #include "rtl/instance.hxx" #endif @@ -329,7 +329,7 @@ void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu ) { if ( GetDialogParent()->isUrlAllowed( *aLoop ) ) { - Image aImage = SvFileInformationManager::GetImage( + Image aImage = SvFileInformationManager::GetImage( INetURLObject(*aLoop), bIsHighContrast ); if ( LocalFileHelper::ConvertURLToSystemPath(*aLoop, sDisplayName) ) _pMenu->InsertItem( nItemId, sDisplayName, aImage ); diff --git a/framework/inc/dispatch/basedispatcher.hxx b/framework/inc/dispatch/basedispatcher.hxx index f74efb05ca..d435eab3b6 100644 --- a/framework/inc/dispatch/basedispatcher.hxx +++ b/framework/inc/dispatch/basedispatcher.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ #include #include /*DRAFT -#include +#include */ //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index cc141f37ae..f29cbe4377 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include +#include #include //_________________________________________________________________________________________________________________ @@ -85,7 +85,7 @@ namespace framework{ @base OWeakObject implements ref counting for this class. - + @devstatus ready @threadsafe yes @modified 06.08.2004 08:41, as96863 @@ -105,13 +105,13 @@ class PersistentWindowState : // interfaces /// may we need an uno service manager to create own services css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /// reference to the frame which was created by the office himself css::uno::WeakReference< css::frame::XFrame > m_xFrame; - + /// we call SetWindowState one times only for the same frame! sal_Bool m_bWindowStateAlreadySet; - + //________________________________ // interface @@ -150,79 +150,79 @@ class PersistentWindowState : // interfaces //____________________________ /** @short identify the application module, which is used behind the component of our frame. - + @param xSMGR needed to create needed uno resources. - + @param xFrame contains the component, wich must be identified. - + @return [string] a module identifier for the current frame component. */ static ::rtl::OUString implst_identifyModule(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const css::uno::Reference< css::frame::XFrame >& xFrame); - + //____________________________ /** @short retrieve the window state from the configuration. - + @param xSMGR needed to create the configuration access. - + @param sModuleName identifies the application module, where the information should be getted for. - + @return [string] contains the information about position and size. */ static ::rtl::OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const ::rtl::OUString& sModuleName); - + //____________________________ /** @short retrieve the window state from the container window. - + @param xWindow must point to the container window of the frame. We use it VCL part here - because the toolkit doesnt provide the right functionality! - + @return [string] contains the information about position and size. */ static ::rtl::OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow); - + //____________________________ /** @short restore the position and size on the container window. - + @param xSMGR needed to create the configuration access. - + @param sModuleName identifies the application module, where the information should be setted on. - + @param sWindowState contains the information about position and size. */ static void implst_setWindowStateOnConfig(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , const ::rtl::OUString& sModuleName , const ::rtl::OUString& sWindowState ); - + //____________________________ /** @short restore the position and size on the container window. - + @param xWindow must point to the container window of the frame. We use it VCL part here - because the toolkit doesnt provide the right functionality! - + @param sWindowState contains the information about position and size. */ static void implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow , const ::rtl::OUString& sWindowState); - + }; // class PersistentWindowState } // namespace framework diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 96549bfe30..5a6538409a 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ //_________________________________________________________________________________________________________________ #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX -#include +#include #endif #ifndef _CPPUHELPER_WEAK_HXX_ @@ -137,7 +137,7 @@ class TitleBarUpdate : // interfaces // structs, types private: - + struct TModuleInfo { /// internal id of this module @@ -155,10 +155,10 @@ class TitleBarUpdate : // interfaces /// may we need an uno service manager to create own services css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - + /// reference to the frame which was created by the office himself css::uno::WeakReference< css::frame::XFrame > m_xFrame; - + //________________________________ // interface @@ -189,7 +189,7 @@ class TitleBarUpdate : // interfaces // XTitleChangeListener virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent) throw (css::uno::RuntimeException); - + //____________________________ // XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) @@ -199,53 +199,53 @@ class TitleBarUpdate : // interfaces // helper private: - + //____________________________ /** @short identify the application module, which is used behind the component of our frame. - + @param xFrame contains the component, wich must be identified. - + @param rInfo describe the module in its details. Is set only if return value is true. - + @return [sal_Bool] TRUE in casee module could be identified and all needed values could be read. FALSE otherwise. */ ::sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame, TModuleInfo& rInfo ); - + //____________________________ /** @short set a new icon and title on the title bar of our connected frame window. - + @descr It does not check if an update is realy needed. That has to be done outside. It retrieves all needed informations and update the title bar - nothing less - nothing more. */ void impl_forceUpdate(); - + //____________________________ /** @short identify the current component (inside the connected frame) and set the right module icon on the title bar. - + @param xFrame the frame which contains the component and where the icon must be set on the window title bar. */ void impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame); - + //____________________________ /** @short gets the current title from the frame and set it on the window. - + @param xFrame the frame which contains the component and where the title must be set on the window title bar. */ void impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame); - + }; // class TitleBarUpdate } // namespace framework diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index eaffedbc0e..5d1d114124 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -380,23 +380,23 @@ #include "sot/storage.hxx" #include "svtools/acceleratorexecute.hxx" -#include "svtools/cmdoptions.hxx" +#include "unotools/cmdoptions.hxx" #include "svtools/colorcfg.hxx" #include "svtools/ctrltool.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/filter.hxx" #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/imageitm.hxx" #include "svtools/imgdef.hxx" #include "svtools/inettype.hxx" -#include "svtools/internaloptions.hxx" +#include "unotools/internaloptions.hxx" #include "svtools/lstner.hxx" #include "svtools/menuoptions.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/moduleoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/smplhint.hxx" #include "svtools/solar.hrc" diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 3e3fffaa7f..b8839a8c2f 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include +#include #include #include #include @@ -181,80 +181,80 @@ class Desktop : // interfaces //--------------------------------------------------------------------- /** @interface XDesktop - + @short try to shutdown these desktop environment. - + @descr Will try to close all frames. If at least one frame could not be closed successfully termination will be stopped. - + Registered termination listener will be taken into account also. As special feature some of our registered listener are well known by it's UNO implementation name. They are handled different to all other listener. - + Btw: Desktop.terminate() was designed in the past to be used within an UI based envrionment. So it's allowed e.g. to call XController.suspend() here. If UI isnt an option ... please use XCloseable.close() at these desktop implementation. ... if it will be supported in the future .-)) - + @seealso XTerminateListener @seealso XTerminateListener2 - + @return true if all open frames could be closed and no listener throwed a veto exception; false otherwise. - + @onerror False will be returned. @threadsafe yes */ virtual ::sal_Bool SAL_CALL terminate() throw( css::uno::RuntimeException ); - + //--------------------------------------------------------------------- /** @interface XDesktop - + @short add a listener for termination events - + @descr Additional to adding normal listener these method was implemented special. Every listener will be asked for it's uno implementation name. Some of them are well known ... and the corresponding listener wont be added to the container of "normal listener". Those listener will be set as special member. see e.g. member m_xSfxTerminator - + @seealso terminate() - + @param xListener the listener for registration. - + @threadsafe yes */ virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException ); - + //--------------------------------------------------------------------- /** @interface XDesktop - + @short remove a listener from this container. - + @descr Additional to removing normal listener these method was implemented special. Every listener will be asked for it's uno implementation name. Some of them are well known ... and the corresponding listener was set as special member. Now those special member will be reseted also. see e.g. member m_xSfxTerminator - + @seealso terminate() - + @param xListener the listener for deregistration. - + @threadsafe yes */ virtual void SAL_CALL removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener ) throw( css::uno::RuntimeException ); - + virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getComponents ( ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::lang::XComponent > SAL_CALL getCurrentComponent ( ) throw( css::uno::RuntimeException ); virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getCurrentFrame ( ) throw( css::uno::RuntimeException ); @@ -327,21 +327,21 @@ class Desktop : // interfaces virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - + // css.frame.XUntitledNumbers virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - + // css.frame.XUntitledNumbers virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - + // css.frame.XUntitledNumbers virtual ::rtl::OUString SAL_CALL getUntitledPrefix() throw (css::uno::RuntimeException); - + //------------------------------------------------------------------------------------------------------------- // protected methods //------------------------------------------------------------------------------------------------------------- @@ -367,7 +367,7 @@ class Desktop : // interfaces css::uno::Reference< css::lang::XComponent > impl_getFrameComponent ( const css::uno::Reference< css::frame::XFrame >& xFrame ) const; static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor( ); - + //--------------------------------------------------------------------- /** calls queryTermination() on every registered termination listener. * @@ -388,9 +388,9 @@ class Desktop : // interfaces */ void impl_sendQueryTerminationEvent(TTerminateListenerList& lCalledListener, ::sal_Bool& bVeto ); - + //--------------------------------------------------------------------- - /** calls cancelTermination() on every termination listener + /** calls cancelTermination() on every termination listener * where queryTermination() was called before. * * Note: Only normal termination listener (registered in list m_aListenerContainer @@ -404,7 +404,7 @@ class Desktop : // interfaces * @see impl_sendQueryTerminationEvent() */ void impl_sendCancelTerminationEvent(const TTerminateListenerList& lCalledListener); - + //--------------------------------------------------------------------- /** calls notifyTermination() on every registered termination listener. * @@ -413,7 +413,7 @@ class Desktop : // interfaces * has to be handled explicitly ! */ void impl_sendNotifyTerminationEvent(); - + //--------------------------------------------------------------------- /** try to close all open frames. * @@ -467,13 +467,13 @@ class Desktop : // interfaces ::rtl::OUString m_sName ; ::rtl::OUString m_sTitle ; css::uno::Reference< css::frame::XDispatchRecorderSupplier > m_xDispatchRecorderSupplier ; - + //--------------------------------------------------------------------- /** special terminate listener to close pipe and block external requests * during/after termination process is/was running */ css::uno::Reference< css::frame::XTerminateListener > m_xPipeTerminator; - + //--------------------------------------------------------------------- /** special terminate listener shown inside system tray (quick starter) * Will hinder the office on shutdown ... but wish to allow closing @@ -481,7 +481,7 @@ class Desktop : // interfaces * it has to be handled special .-) */ css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher; - + //--------------------------------------------------------------------- /** special terminate listener which loads images asynchronous for current open documents. * Because internaly it uses blocking system APIs ... it cant be guaranteed that @@ -491,7 +491,7 @@ class Desktop : // interfaces * So these implementation must be a special terminate listener too .-( */ css::uno::Reference< css::frame::XTerminateListener > m_xSWThreadManager; - + //--------------------------------------------------------------------- /** special terminate listener shuting down the SfxApplication. * Because these desktop instance closes documents and informs listener diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 48402d5720..b63e76ed0e 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -87,7 +87,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include +#include #include #include #include @@ -318,13 +318,13 @@ class Frame : // interfaces //--------------------------------------------------------------------------------------------------------- virtual ::rtl::OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException); virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (css::uno::RuntimeException); - + //--------------------------------------------------------------------------------------------------------- // XTitleChangeBroadcaster //--------------------------------------------------------------------------------------------------------- virtual void SAL_CALL addTitleChangeListener ( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener) throw (css::uno::RuntimeException); virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListenr ) throw (css::uno::RuntimeException); - + //--------------------------------------------------------------------------------------------------------- // PropertySetHelper => XPropertySet, XPropertySetInfo //--------------------------------------------------------------------------------------------------------- diff --git a/framework/inc/services/pluginframe.hxx b/framework/inc/services/pluginframe.hxx index 46a8281c17..a8b13b682d 100644 --- a/framework/inc/services/pluginframe.hxx +++ b/framework/inc/services/pluginframe.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -57,7 +57,7 @@ #ifndef _VCL_ATOM_HXX #include #endif -#include +#include //_________________________________________________________________________________________________________________ @@ -358,7 +358,7 @@ class cIMPL_MainThreadExecutor //------------------------------------------------------------------------------------------------------------- public: static void execute( cIMPL_MainThreadExecutorRequest* pRequest ); - + /*-****************************************************************************************************//** @short - @descr - diff --git a/framework/source/classes/bmkmenu.cxx b/framework/source/classes/bmkmenu.cxx index 6bee8c399d..e17672b4a0 100644 --- a/framework/source/classes/bmkmenu.cxx +++ b/framework/source/classes/bmkmenu.cxx @@ -61,7 +61,7 @@ //_________________________________________________________________________________________________________________ #include #include -#include +#include #include #include @@ -130,7 +130,7 @@ USHORT BmkMenu_Impl::GetMID() // ------------------------------------------------------------------------ -BmkMenu::BmkMenu( com::sun::star::uno::Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType, BmkMenu* pRoot ) +BmkMenu::BmkMenu( com::sun::star::uno::Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType, BmkMenu* pRoot ) :AddonMenu(xFrame) ,m_nType( nType ) { @@ -139,7 +139,7 @@ BmkMenu::BmkMenu( com::sun::star::uno::Reference< XFrame >& xFrame, BmkMenu::Bmk } BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType ) - :AddonMenu(xFrame) + :AddonMenu(xFrame) ,m_nType( nType ) { _pImp = new BmkMenu_Impl(); diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index b245cff3ad..8928bf6ea7 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,8 +66,8 @@ #include #include -#include -#include +#include +#include #include #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -140,11 +140,11 @@ const ::rtl::OUString aSpecialWindowCommand( RTL_CONSTASCII_USTRINGPARAM( "Windo const ::rtl::OUString UNO_COMMAND( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); // #110897# -MenuManager::MenuManager( +MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) + REFERENCE< XFRAME >& rFrame, Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) : // #110897# - ThreadHelpBase( &Application::GetSolarMutex() ), + ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) { m_bActive = sal_False; @@ -191,13 +191,13 @@ MenuManager::MenuManager( aItemCommand == aSlotSpecialToolsMenu ) && AddonMenuManager::HasAddonMenuElements() ) { - USHORT nCount = 0; + USHORT nCount = 0; AddonMenu* pSubMenu = AddonMenuManager::CreateAddonMenu( rFrame ); if ( pSubMenu && ( pSubMenu->GetItemCount() > 0 )) { if ( pPopupMenu->GetItemType( nCount-1 ) != MENUITEM_SEPARATOR ) pPopupMenu->InsertSeparator(); - + // Use resource to load popup menu title String aAddonsStrRes = String( FwkResId( STR_MENU_ADDONS )); pPopupMenu->InsertItem( ITEMID_ADDONLIST, aAddonsStrRes ); @@ -208,7 +208,7 @@ MenuManager::MenuManager( aItemCommand = aSlotString; aItemCommand += ::rtl::OUString::valueOf( (sal_Int32)ITEMID_ADDONLIST ); pPopupMenu->SetItemCommand( ITEMID_ADDONLIST, aItemCommand ); - + // #110897# // MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False ); AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False); @@ -248,7 +248,7 @@ MenuManager::MenuManager( if ( pMenu->GetItemText( nItemId ).Len() == 0 ) aQueryLabelItemIdVector.push_back( nItemId ); #endif - + if ( m_bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); @@ -273,7 +273,7 @@ MenuManager::MenuManager( if ( pMenu->GetItemText( nItemId ).Len() == 0 ) aQueryLabelItemIdVector.push_back( nItemId ); #endif - + if ( m_bShowMenuImages && !pMenu->GetItemImage( nItemId )) { Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE, m_bWasHiContrast ); @@ -290,7 +290,7 @@ MenuManager::MenuManager( // Add-Ons uses a images from different places Image aImage; rtl::OUString aImageId; - + MenuConfiguration::Attributes* pMenuAttributes = (MenuConfiguration::Attributes*)pMenu->GetUserValue( nItemId ); @@ -306,7 +306,7 @@ MenuManager::MenuManager( if ( !aImage ) aImage = AddonsOptions().GetImageFromURL( aItemCommand, FALSE, m_bWasHiContrast ); } - + if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -317,7 +317,7 @@ MenuManager::MenuManager( pMenu->SetItemImage( nItemId, aImage ); } } - + REFERENCE< XDISPATCH > aXDispatchRef; m_aMenuItemHandlerVector.push_back( new MenuItemHandler( nItemId, NULL, aXDispatchRef )); #if 0 @@ -355,11 +355,11 @@ MenuManager::MenuManager( } // #110897# -MenuManager::MenuManager( +MenuManager::MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) + REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ) : // #110897# - ThreadHelpBase( &Application::GetSolarMutex() ), + ThreadHelpBase( &Application::GetSolarMutex() ), mxServiceFactory(xServiceFactory) { m_bActive = sal_False; @@ -788,7 +788,7 @@ void MenuManager::UpdateSpecialWindowMenu( Menu* pMenu,const Reference< XMultiSe { Reference< XFrame > xFrame; xList->getByIndex(i) >>= xFrame; - + if (xFrame.is()) { if ( xFrame == xCurrentFrame ) @@ -1033,7 +1033,7 @@ IMPL_LINK( MenuManager, Select, Menu *, pMenu ) { Reference< XFrame > xFrame; xList->getByIndex(i) >>= xFrame; - + if ( xFrame.is() && nTaskId == nCurItemId ) { Window* pWin = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); @@ -1096,7 +1096,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFac void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const ::rtl::OUString& _sItemCommand,USHORT _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren) { MenuManager* pSubMenuManager = new MenuManager( getServiceFactory(), m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren ); - + // store menu item command as we later have to know which menu is active (see Activate handler) pSubMenuManager->m_aMenuItemCommand = _sItemCommand; @@ -1158,7 +1158,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame,Menu* _pMenu,sal_B Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, FALSE, bIsHiContrast ); if ( !aImage ) aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, FALSE, bIsHiContrast ); - + _pMenu->SetItemImage( nId, aImage ); } } diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index b49c29e2c8..4652b768e1 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include #include #include -#include +#include //_______________________________________________ // namespace @@ -394,7 +394,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) // on mac close down, quickstarter keeps the process alive // however if someone has shut down the quickstarter // behave as any other platform - + bool bQuickstarterRunning = false; // get quickstart service try @@ -429,7 +429,7 @@ IMPL_LINK( CloseDispatcher, impl_asyncCallback, void*, EMPTYARG ) if (xController.is()) xController->suspend(sal_False); } - + // inform listener sal_Int16 nState = css::frame::DispatchResultState::FAILURE; if (bSuccess) @@ -469,7 +469,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc // Frame already dead ... so this view is closed ... is closed ... is ... .-) if (! xFrame.is()) return sal_True; - + // Close all views to the same document ... if forced to do so. // But dont touch our own frame here! // We must do so ... because the may be following controller->suspend() @@ -481,7 +481,7 @@ sal_Bool CloseDispatcher::implts_prepareFrameForClosing(const css::uno::Referenc css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.unlock(); // <- SAFE ---------------------------------- - + css::uno::Reference< css::frame::XFramesSupplier > xDesktop(xSMGR->createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW); FrameListAnalyzer aCheck(xDesktop, xFrame, FrameListAnalyzer::E_ALL); @@ -614,14 +614,14 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig return xFrame; OSL_ENSURE((sTarget.getLength() < 1), "CloseDispatch used for unexpected target. Magic things will happen now .-)"); - + css::uno::Reference< css::frame::XFrame > xTarget = xFrame; while(sal_True) { // a) top frames wil be closed if (xTarget->isTop()) return xTarget; - + // b) even child frame containing top level windows (e.g. query designer of database) will be closed css::uno::Reference< css::awt::XWindow > xWindow = xTarget->getContainerWindow(); css::uno::Reference< css::awt::XTopWindow > xTopWindowCheck(xWindow, css::uno::UNO_QUERY); @@ -640,14 +640,14 @@ css::uno::Reference< css::frame::XFrame > CloseDispatcher::static_impl_searchRig ) return xTarget; } - + // c) try to find better results on parent frame // If no parent frame exists (because this frame is used outside the desktop tree) // the given frame must be used directly. css::uno::Reference< css::frame::XFrame > xParent(xTarget->getCreator(), css::uno::UNO_QUERY); if ( ! xParent.is()) return xTarget; - + // c1) check parent frame inside next loop ... xTarget = xParent; } diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index def4f785be..9326181c64 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ #include #include #include -#include +#include //_______________________________________________ // namespace diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index f4d4f2ce7e..8378a7da2e 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -105,7 +105,7 @@ #include #include #include -#include +#include #include #include @@ -318,7 +318,7 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan { const ::rtl::OUString aDockWinPrefixCommand( RTL_CONSTASCII_USTRINGPARAM( "DockingWindow" )); css::uno::WeakReference< css::frame::XDispatchHelper > xDispatchHelper; - + sal_Int32 nID = rDockingWindowName.toInt32(); sal_Int32 nIndex = nID - DOCKWIN_ID_BASE; @@ -327,9 +327,9 @@ static void impl_setDockingWindowVisibility( const css::uno::Reference< css::lan { ::rtl::OUString aDockWinCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:" )); ::rtl::OUString aDockWinArgName( aDockWinPrefixCommand ); - + aDockWinArgName += ::rtl::OUString::valueOf( nIndex ); - + css::uno::Sequence< css::beans::PropertyValue > aArgs(1); aArgs[0].Name = aDockWinArgName; aArgs[0].Value = css::uno::makeAny( bVisible ); @@ -2289,7 +2289,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea nLastPos = rElement.m_aDockedData.m_aPos.X() + aPosSize.Width; - + rRowColumnWindowData.aRowColumnWindowSizes.push_back( css::awt::Rectangle( rElement.m_aDockedData.m_aPos.X(), rElement.m_aDockedData.m_aPos.Y(), @@ -2307,7 +2307,7 @@ void LayoutManager::implts_getDockingAreaElementInfoOnSingleRowCol( DockingArea rRowColumnWindowData.nSpace += nSpace; else nSpace = 0; - + nLastPos = rElement.m_aDockedData.m_aPos.Y() + aPosSize.Height; rRowColumnWindowData.aRowColumnWindowSizes.push_back( @@ -4279,7 +4279,7 @@ throw (RuntimeException) else if ( aElementType.equalsIgnoreAsciiCaseAscii( "dockingwindow" )) { aWriteLock.unlock(); - + // The docking window is created by a factory method located in the sfx2 library. CreateDockingWindow( xFrame, aElementName ); } @@ -5309,7 +5309,7 @@ throw (RuntimeException) ReadGuard aReadGuard( m_aLock ); css::uno::Reference< css::frame::XFrame > xFrame( m_xFrame ); aReadGuard.unlock(); - + return IsDockingWindowVisible( xFrame, aElementName ); } } @@ -5662,7 +5662,7 @@ void LayoutManager::implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockin sal_Int32 nSpace = rRowColumnWindowData.aRowColumnSpace[i]; if ( nSpace >= -nDiff ) { - + if (( nDockingArea == DockingArea_DOCKINGAREA_TOP ) || ( nDockingArea == DockingArea_DOCKINGAREA_BOTTOM )) { diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index ed86195618..3bf20e9f65 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include #endif -#include +#include #include #include #include @@ -252,7 +252,7 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const if ( pIt != lModelDescriptor.end() ) lDescriptor[::comphelper::MediaDescriptor::PROP_MACROEXECUTIONMODE()] = pIt->second; } - + return lDescriptor; } @@ -1363,7 +1363,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // frame we referr to any hidden frame also (but as fallback only). css::uno::Reference< css::frame::XFrame > xHiddenTask; css::uno::Reference< css::frame::XFrame > xTask; - + sal_Int32 count = xTaskList->getCount(); for (sal_Int32 i=0; i LoadEnv::impl_searchAlreadyLoaded() xTask.clear (); continue; } - + // Hidden frames are special. // They will be used as "last chance" if there is no visible frame pointing to the same model. // Safe the result but continue with current loop might be looking for other visible frames. @@ -1424,7 +1424,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() xTask.clear (); continue; } - + // We found a visible task pointing to the right model ... // Break search. break; @@ -1441,7 +1441,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() else if (xHiddenTask.is()) xResult = xHiddenTask; - + if (xResult.is()) { // Now we are shure, that this task includes the searched document. @@ -1449,11 +1449,11 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded() // if an optional jumpmark is given too. if (m_aURL.Mark.getLength()) impl_jumpToMark(xResult, m_aURL); - + // bring it to front and make sure it's visible... impl_makeFrameWindowVisible(xResult->getContainerWindow(), sal_True); } - + aReadLock.unlock(); // <- SAFE @@ -1604,7 +1604,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget() m_bReactivateControllerOnError = bReactivateOldControllerOnError; aWriteLock.unlock(); // <- SAFE .................................. - + // bring it to front ... impl_makeFrameWindowVisible(xTask->getContainerWindow(), sal_True); @@ -1738,7 +1738,7 @@ void LoadEnv::impl_reactForLoadingState() 16.01.2005 13:04 -----------------------------------------------*/ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , - sal_Bool bForceToFront) + sal_Bool bForceToFront) { css::uno::Reference< css::awt::XTopWindow > xTopWindow(xWindow, css::uno::UNO_QUERY); diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index ca7b94f2c5..f223b85012 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include #include #include @@ -1916,7 +1916,7 @@ void AutoRecovery::implts_markDocumentAsSaved(const css::uno::Reference< css::fr ::comphelper::MediaDescriptor lDescriptor(rInfo.Document->getArgs()); rInfo.RealFilter = lDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_FILTERNAME(), ::rtl::OUString()); - + css::uno::Reference< css::frame::XTitle > xDocTitle(xDocument, css::uno::UNO_QUERY); if (xDocTitle.is ()) rInfo.Title = xDocTitle->getTitle (); @@ -2311,7 +2311,7 @@ void AutoRecovery::implts_saveOneDoc(const ::rtl::OUString& // #i66598# use special handling of property "DocumentBaseURL" (it must be an empty string!) // for make hyperlinks working lNewArgs[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString(); - + // try to save this document as a new temp file everytimes. // Mark AutoSave state as "INCOMPLETE" if it failed. // Because the last temp file is to old and does not include all changes. @@ -2926,10 +2926,10 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // Of course following recovery session must be started without // any "handle" state ... implts_resetHandleStates(sal_False); - + // flush config cached back to disc. impl_flushALLConfigChanges(); - + // try to make sure next time office will be started user wont be // notified about any other might be running office instance // remove ".lock" file from disc ! @@ -3015,7 +3015,7 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) CFG_ENTRY_SESSIONDATA, css::uno::makeAny(sal_True), ::comphelper::ConfigurationHelper::E_STANDARD); - + // flush config cached back to disc. impl_flushALLConfigChanges(); } @@ -3505,10 +3505,10 @@ void AutoRecovery::impl_flushALLConfigChanges() css::uno::Reference< css::uno::XInterface > xRecoveryCfg(m_xRecoveryCFG, css::uno::UNO_QUERY); aReadLock.unlock(); // <- SAFE - + if (xRecoveryCfg.is()) ::comphelper::ConfigurationHelper::flush(xRecoveryCfg); - + // SOLAR SAFE -> ::vos::OGuard aGuard( Application::GetSolarMutex() ); ::utl::ConfigManager* pCfgMgr = ::utl::ConfigManager::GetConfigManager(); @@ -3541,12 +3541,12 @@ void AutoRecovery::st_impl_removeLockFile() { ::rtl::OUString sUserURL; ::utl::Bootstrap::locateUserInstallation( sUserURL ); - + ::rtl::OUStringBuffer sLockURLBuf; sLockURLBuf.append (sUserURL); sLockURLBuf.appendAscii("/.lock"); ::rtl::OUString sLockURL = sLockURLBuf.makeStringAndClear(); - + AutoRecovery::st_impl_removeFile(sLockURL); } catch(const css::uno::Exception&) diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index a33339003a..55a953fa3d 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include "tools/urlobj.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/imagemgr.hxx" #include "svtools/svtools.hrc" @@ -104,7 +104,7 @@ void DecoToolBox::calcMinSize() aTbx.InsertItem( nId, GetItemImage( nId ) ); } aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT ); - maMinSize = aTbx.CalcWindowSizePixel(); + maMinSize = aTbx.CalcWindowSizePixel(); } Size DecoToolBox::getMinSize() @@ -145,7 +145,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : mpAccExec( NULL ) { mnColumnWidth[0] = mnColumnWidth[1] = 0; - + // get icon images from vcl resource and set them on the appropriate buttons loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton ); loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton ); @@ -155,7 +155,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton ); loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton ); loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton ); - + BitmapEx aExtImage( FwkResId( BMP_BACKING_EXT ) ); String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) ); BitmapEx aRegImage( FwkResId( BMP_BACKING_REG ) ); @@ -164,20 +164,20 @@ BackingWindow::BackingWindow( Window* i_pParent ) : String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) ); BitmapEx aTplRepImage( FwkResId( BMP_BACKING_TPLREP ) ); String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) ); - + // clean up resource stack FreeResource(); - + maWelcome.SetPaintTransparent( TRUE ); maProduct.SetPaintTransparent( TRUE ); EnableChildTransparentMode(); - + SetStyle( GetStyle() | WB_DIALOGCONTROL ); - + // add some breathing space for the images maButtonImageSize.Width() += 12; maButtonImageSize.Height() += 12; - + // force tab cycling in toolbox maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE ); @@ -193,13 +193,13 @@ BackingWindow::BackingWindow( Window* i_pParent ) : maToolbox.SetItemText( nItemId_Extensions, aExtHelpText ); maToolbox.SetItemCommand( nItemId_Extensions, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Extensions" ) ) ); maToolbox.ShowItem( nItemId_Extensions ); - + maToolbox.InsertItem( nItemId_Reg, Image( aRegImage ) ); maToolbox.SetQuickHelpText( nItemId_Reg, aRegHelpText ); maToolbox.SetItemText( nItemId_Reg, aRegHelpText ); maToolbox.SetItemCommand( nItemId_Reg, String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Register" ) ) ); maToolbox.ShowItem( nItemId_Reg ); - + maToolbox.InsertItem( nItemId_Info, Image( aInfoImage ) ); maToolbox.SetItemText( nItemId_Info, aInfoHelpText ); maToolbox.SetQuickHelpText( nItemId_Info, aInfoHelpText ); @@ -210,7 +210,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : mxDesktop = Reference( comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_DESKTOP ),UNO_QUERY ); if( mxDesktop.is() ) mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY ); - + maWriterButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:WriterButton" ) ) ) ); maCalcButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:CalcButton" ) ) ) ); maImpressButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:ImpressButton" ) ) ) ); @@ -220,7 +220,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) : maTemplateButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateButton" ) ) ) ); maOpenButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:OpenButton" ) ) ) ); maToolbox.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Toolbox" ) ) ) ); - + // init background initBackground(); } @@ -252,7 +252,7 @@ void BackingWindow::DataChanged( const DataChangedEvent& rDCEvt ) void BackingWindow::initBackground() { SetBackground( GetSettings().GetStyleSettings().GetWorkspaceGradient() ); - + bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode(); maWelcomeTextColor = maLabelTextColor = bDark ? Color( COL_WHITE ) : Color( 0x26, 0x35, 0x42 ); Color aTextBGColor( bDark ? COL_BLACK : COL_WHITE ); @@ -269,7 +269,7 @@ void BackingWindow::initBackground() // and scale it to previous size if( aMiddleSize.Width() && aMiddleSize.Height() ) maBackgroundMiddle.Scale( aMiddleSize ); - + if( GetSettings().GetLayoutRTL() ) { // replace images by RTL versions @@ -310,9 +310,9 @@ void BackingWindow::initControls() { if( mbInitControls ) return; - + mbInitControls = true; - + // calculate dialog size // begin with background bitmap maControlRect = Rectangle( Point(), maBackgroundLeft.GetSizePixel() ); @@ -320,7 +320,7 @@ void BackingWindow::initControls() maControlRect.Right() -= nShadowRight; maControlRect.Top() += nShadowTop; maControlRect.Bottom() -= nShadowBottom; - + long nYPos = 0; // set bigger welcome string maWelcome.SetText( maWelcomeString ); @@ -336,16 +336,16 @@ void BackingWindow::initControls() maWelcome.SetControlFont( maTextFont ); maWelcomeSize = Size( maWelcome.GetTextWidth( maWelcomeString ), maWelcome.GetTextHeight() ); maWelcomeSize.Width() = (maWelcomeSize.Width() * 20)/19; - + nYPos += (maWelcomeSize.Height()*3)/2; - + if( maControlRect.GetWidth() < nBtnPos + maWelcomeSize.Width() + 20 ) maControlRect.Right() = maControlRect.Left() + maWelcomeSize.Width() + nBtnPos + 20; maWelcome.Show(); - + nYPos += maWelcomeSize.Height(); - + // set product string maTextFont.SetSize( Size( 0, 30 ) ); maProduct.SetFont( maTextFont ); @@ -359,24 +359,24 @@ void BackingWindow::initControls() maProduct.SetText( maProductString ); maProductSize = Size( maProduct.GetTextWidth( maProductString ), maProduct.GetTextHeight() ); maProductSize.Width() = (maProductSize.Width() * 20)/19; - + if( maControlRect.GetWidth() < maProductSize.Width() + nBtnPos + 10 ) maControlRect.Right() = maControlRect.Left() + maProductSize.Width() + nBtnPos + 10; maProduct.Show(); - + nYPos += (maProductSize.Height()*3)/2; - + // set a slighly larger font than normal labels on the texts maTextFont.SetSize( Size( 0, 11 ) ); maTextFont.SetWeight( WEIGHT_NORMAL ); - + maCreateText.SetText( maCreateString ); maCreateText.SetFont( maTextFont ); maCreateText.SetControlFont( maTextFont ); maCreateSize = Size( maCreateText.GetTextWidth( maCreateString ), maCreateText.GetTextHeight() ); maCreateText.Show(); - + nYPos += (maCreateSize.Height()*3)/2; // collect the URLs of the entries in the File/New menu @@ -395,12 +395,12 @@ void BackingWindow::initControls() if ( sURL.getLength() ) aFileNewAppsAvailable.insert( sURL ); } - + // create mnemonics on the fly, preregister the mnemonics of the menu MnemonicGenerator aMnemns; maTemplateString = MnemonicGenerator::EraseAllMnemonicChars( maTemplateString ); maOpenString = MnemonicGenerator::EraseAllMnemonicChars( maOpenString ); - + SystemWindow* pSysWin = GetSystemWindow(); if( pSysWin ) { @@ -416,7 +416,7 @@ void BackingWindow::initControls() } } } - + // layout the buttons layoutButtonAndText( WRITER_URL, 0, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, @@ -438,7 +438,7 @@ void BackingWindow::initControls() layoutButtonAndText( MATH_URL, 1, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SMATH, maMathButton, maMathText, aMnemns ); - + nYPos += 3*maButtonImageSize.Height() / 2; layoutButtonAndText( NULL, -1, aFileNewAppsAvailable, aModuleOptions, SvtModuleOptions::E_SWRITER, @@ -449,18 +449,18 @@ void BackingWindow::initControls() aModuleOptions, SvtModuleOptions::E_SWRITER, maOpenButton, maOpenText, aMnemns, maOpenString ); nYPos += 10; - + DBG_ASSERT( nYPos < maControlRect.GetHeight(), "misformatting !" ); if( mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20 > maControlRect.GetWidth() ) maControlRect.Right() = maControlRect.Left() + mnColumnWidth[0] + mnColumnWidth[1] + nBtnPos + 20; - + maToolbox.SetSelectHdl( LINK( this, BackingWindow, ToolboxHdl ) ); maToolbox.Show(); - + // scale middle map to formatted width Size aMiddleSegmentSize( maControlRect.GetSize().Width() + nShadowLeft + nShadowRight, maBackgroundMiddle.GetSizePixel().Height() ); - + long nLW = maBackgroundLeft.GetSizePixel().Width(); long nRW = maBackgroundRight.GetSizePixel().Width(); if( aMiddleSegmentSize.Width() > nLW + nRW ) @@ -471,7 +471,7 @@ void BackingWindow::initControls() } else maBackgroundMiddle = BitmapEx(); - + Resize(); } @@ -503,7 +503,7 @@ void BackingWindow::layoutButtonAndText( { i_rBtn.Enable( FALSE ); } - + // setup text i_rText.SetFont( maTextFont ); i_rText.SetControlFont( maTextFont ); @@ -520,7 +520,7 @@ void BackingWindow::layoutButtonAndText( if( nTextWidth > mnColumnWidth[nColumn] ) mnColumnWidth[nColumn] = nTextWidth; } - + // show the controls i_rBtn.Show(); i_rText.Show(); @@ -529,14 +529,14 @@ void BackingWindow::layoutButtonAndText( void BackingWindow::Paint( const Rectangle& ) { bool bDark = GetSettings().GetStyleSettings().GetHighContrastMode(); - + Color aBackColor( bDark ? COL_BLACK : COL_WHITE ); // fill control rect SetLineColor(); SetFillColor( aBackColor ); DrawRect( maControlRect ); - + // draw bitmap if( GetSettings().GetLayoutRTL() ) { @@ -577,7 +577,7 @@ long BackingWindow::Notify( NotifyEvent& rNEvt ) mpAccExec = svt::AcceleratorExecute::createAcceleratorHelper(); mpAccExec->init( comphelper::getProcessServiceFactory(), mxFrame); } - + const KeyEvent* pEvt = rNEvt.GetKeyEvent(); if( pEvt && mpAccExec->execute(pEvt->GetKeyCode()) ) return 1; @@ -599,7 +599,7 @@ void BackingWindow::Resize() maControlRect = Rectangle( Point( (aWindowSize.Width() - aControlSize.Width()) / 2, (aWindowSize.Height() - aControlSize.Height()) / 2 ), aControlSize ); - + maToolbox.calcMinSize(); Size aTBSize( maToolbox.getMinSize() ); Point aTBPos( maControlRect.Right() - aTBSize.Width() - 10, @@ -629,18 +629,18 @@ void BackingWindow::Resize() { nDiff++; } - + long nYPos = maControlRect.Top(); nYPos += nW2Delta - nDiff; maWelcome.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), Size( maControlRect.GetWidth() - nBtnPos - 5, (maWelcomeSize.Height()*20)/19 ) ); - nYPos += nWDelta - nDiff; + nYPos += nWDelta - nDiff; maProduct.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), Size( maControlRect.GetWidth() - nBtnPos - 5, (maProductSize.Height()*20)/19 ) ); nYPos += nPDelta - nDiff; - + maCreateText.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), Size( maControlRect.GetWidth() - nBtnPos - 5, maCreateSize.Height() ) ); - + nYPos += nCDelta - nDiff; maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + nBtnPos, nYPos ), maButtonImageSize ); @@ -679,7 +679,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) { const char* pNodePath = NULL; const char* pNode = NULL; - + switch( maToolbox.GetCurItemId() ) { case nItemId_Extensions: @@ -737,7 +737,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) //throws css::container::NoSuchElementException, css::lang::WrappedTargetException Any value( xNameAccess->getByName(rtl::OUString::createFromAscii(pNode)) ); sURL = value.get (); - + Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SystemShellExecute" ) ) ), @@ -751,7 +751,7 @@ IMPL_LINK( BackingWindow, ToolboxHdl, void*, EMPTYARG ) { } } - + return 0; } @@ -773,7 +773,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) else if( pButton == &maOpenButton ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - + Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); pArg[0].Name = rtl::OUString::createFromAscii("Referer"); @@ -784,7 +784,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) else if( pButton == &maTemplateButton ) { Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY ); - + Sequence< com::sun::star::beans::PropertyValue > aArgs(1); PropertyValue* pArg = aArgs.getArray(); pArg[0].Name = rtl::OUString::createFromAscii("Referer"); @@ -798,7 +798,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton ) Window* BackingWindow::GetParentLabelFor( const Window* pLabel ) const { const Window* pRet = NULL; - + if( pLabel == &maWriterText ) pRet = &maWriterButton; else if( pLabel == &maCalcText ) @@ -815,14 +815,14 @@ Window* BackingWindow::GetParentLabelFor( const Window* pLabel ) const pRet = &maTemplateButton; else if( pLabel == &maOpenText ) pRet = &maOpenButton; - + return const_cast(pRet); } Window* BackingWindow::GetParentLabeledBy( const Window* pLabeled ) const { const Window *pRet = NULL; - + if( pLabeled == &maWriterButton ) pRet = &maWriterText; else if( pLabeled == &maCalcButton ) @@ -839,7 +839,7 @@ Window* BackingWindow::GetParentLabeledBy( const Window* pLabeled ) const pRet = &maTemplateText; else if( pLabeled == &maOpenButton ) pRet = &maOpenText; - + return const_cast(pRet); } @@ -848,7 +848,7 @@ struct ImplDelayedDispatch Reference< XDispatch > xDispatch; com::sun::star::util::URL aDispatchURL; Sequence< PropertyValue > aArgs; - + ImplDelayedDispatch( const Reference< XDispatch >& i_xDispatch, const com::sun::star::util::URL& i_rURL, const Sequence< PropertyValue >& i_rArgs ) @@ -870,10 +870,10 @@ static long implDispatchDelayed( void*, void* pArg ) catch( Exception ) { } - + // clean up delete pDispatch; - + return 0; } @@ -888,7 +888,7 @@ void BackingWindow::dispatchURL( const rtl::OUString& i_rURL, // check for dispatch provider if( !xProvider.is()) return; - + // get an URL transformer to clean up the URL com::sun::star::util::URL aDispatchURL; aDispatchURL.Complete = i_rURL; diff --git a/framework/source/services/backingwindow.hxx b/framework/source/services/backingwindow.hxx index 9722ddfc86..794fbdcc8a 100644 --- a/framework/source/services/backingwindow.hxx +++ b/framework/source/services/backingwindow.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "vcl/bitmapex.hxx" #include "vcl/toolbox.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/acceleratorexecute.hxx" #include "com/sun/star/frame/XDispatchProvider.hpp" @@ -66,25 +66,25 @@ namespace framework class DecoToolBox : public ToolBox { Size maMinSize; - + using Window::ImplInit; public: DecoToolBox( Window* pParent, WinBits nStyle = 0 ); DecoToolBox( Window* pParent, const ResId& rResId ); - + void DataChanged( const DataChangedEvent& rDCEvt ); - + void calcMinSize(); Size getMinSize(); }; - + class BackingWindow : public Window { com::sun::star::uno::Reference mxDesktop; com::sun::star::uno::Reference mxDesktopDispatchProvider; com::sun::star::uno::Reference mxFrame; com::sun::star::uno::Reference mxBroadcaster; - + FixedText maWelcome; Size maWelcomeSize; FixedText maProduct; @@ -107,32 +107,32 @@ namespace framework ImageButton maTemplateButton; FixedText maOpenText; ImageButton maOpenButton; - + DecoToolBox maToolbox; - + BitmapEx maBackgroundLeft; BitmapEx maBackgroundMiddle; BitmapEx maBackgroundRight; - + String maWelcomeString; String maProductString; String maCreateString; String maOpenString; String maTemplateString; - + Font maTextFont; Rectangle maControlRect; - + long mnColumnWidth[2]; Color maLabelTextColor; Color maWelcomeTextColor; - + Size maButtonImageSize; - + bool mbInitControls; svt::AcceleratorExecute* mpAccExec; - + static const long nBtnPos = 240; static const int nItemId_Extensions = 1; static const int nItemId_Reg = 2; @@ -142,31 +142,31 @@ namespace framework static const int nShadowLeft = 35; static const int nShadowRight = 45; static const int nShadowBottom = 50; - + void loadImage( const ResId& i_rId, ImageButton& i_rButton ); - + void layoutButtonAndText( const char* i_pURL, int nColumn, const std::set& i_rURLS, SvtModuleOptions& i_rOpt, SvtModuleOptions::EModule i_eMod, ImageButton& i_rBtn, FixedText& i_rText, MnemonicGenerator& i_rMnemonicGen, const String& i_rStr = String() ); - + void dispatchURL( const rtl::OUString& i_rURL, const rtl::OUString& i_rTarget = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), const com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >& i_xProv = com::sun::star::uno::Reference< com::sun::star::frame::XDispatchProvider >(), const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& = com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >() ); - + DECL_LINK( ClickHdl, Button* ); DECL_LINK( ToolboxHdl, void* ); - + void initControls(); void initBackground(); public: BackingWindow( Window* pParent ); ~BackingWindow(); - + virtual void Paint( const Rectangle& rRect ); virtual void Resize(); virtual long Notify( NotifyEvent& rNEvt ); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 1d63a503b2..709bfb6bd0 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -106,7 +106,7 @@ #endif #include #include -#include +#include #ifdef ENABLE_ASSERTIONS #ifndef _RTL_STRBUF_HXX_ @@ -630,7 +630,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >& implts_startWindowListening(); impl_enablePropertySet(); - + // create WindowCommandDispatch; it is supposed to release itself at frame destruction (void)new WindowCommandDispatch(xSMGR, this); @@ -2297,7 +2297,7 @@ aEvent // Look for rejected calls. // Sometimes called during dispose() => soft exceptions TransactionGuard aTransaction( m_aTransactionManager, E_SOFTEXCEPTIONS ); - + /* SAFE AREA ----------------------------------------------------------------------------------------------- */ ReadGuard aReadLock( m_aLock ); @@ -2652,7 +2652,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const ::rtl::OUString& /*sProperty*/, css::uno::Reference< css::frame::XLayoutManager > xOldLayoutManager = m_xLayoutManager; css::uno::Reference< css::frame::XLayoutManager > xNewLayoutManager; aValue >>= xNewLayoutManager; - + if (xOldLayoutManager != xNewLayoutManager) { m_xLayoutManager = xNewLayoutManager; diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index 9bda14b891..81338c1cdb 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -66,8 +66,8 @@ #include #include #include -#include -#include +#include +#include #include //_______________________________________________ // interface includes @@ -138,12 +138,12 @@ SessionListener::SessionListener(const css::uno::Reference< css::lang::XMultiSer , OWeakObject ( ) , m_xSMGR (xSMGR ) , m_bRestored( false ) -{ +{ } SessionListener::~SessionListener() { - if (m_rSessionManager.is()) + if (m_rSessionManager.is()) { css::uno::Reference< XSessionManagerListener> me(this); m_rSessionManager->removeSessionManagerListener(me); @@ -181,7 +181,7 @@ void SAL_CALL SessionListener::initialize(const Sequence< Any >& args) { m_rSessionManager->addSessionManagerListener(this); } -} +} void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event) throw (css::uno::RuntimeException) @@ -190,8 +190,8 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event) { if (event.FeatureDescriptor.compareToAscii("update")==0) m_bRestored = sal_True; // a document was restored - // if (event.FeatureDescriptor.compareToAscii("stop")==0) - + // if (event.FeatureDescriptor.compareToAscii("stop")==0) + } else if (event.FeatureURL.Complete.equalsAscii("vnd.sun.star.autorecovery:/doSessionSave")) { @@ -207,11 +207,11 @@ void SAL_CALL SessionListener::statusChanged(const FeatureStateEvent& event) sal_Bool SAL_CALL SessionListener::doRestore() throw (RuntimeException) { - ResetableGuard aGuard(m_aLock); + ResetableGuard aGuard(m_aLock); m_bRestored = sal_False; try { css::uno::Reference< XDispatch > xDispatch(m_xSMGR->createInstance(SERVICENAME_AUTORECOVERY), UNO_QUERY_THROW); - + URL aURL; aURL.Complete = OUString::createFromAscii("vnd.sun.star.autorecovery:/doSessionRestore"); css::uno::Reference< XURLTransformer > xURLTransformer(m_xSMGR->createInstance(SERVICENAME_URLTRANSFORMER), UNO_QUERY_THROW); @@ -220,7 +220,7 @@ sal_Bool SAL_CALL SessionListener::doRestore() xDispatch->addStatusListener(this, aURL); xDispatch->dispatch(aURL, args); m_bRestored = sal_True; - + } catch (com::sun::star::uno::Exception& e) { OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8); OSL_ENSURE(sal_False, aMsg.getStr()); @@ -236,8 +236,8 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl if (bShutdown) { sal_Bool bDispatched = sal_False; - ResetableGuard aGuard(m_aLock); - try + ResetableGuard aGuard(m_aLock); + try { // xd create SERVICENAME_AUTORECOVERY -> XDispatch // xd->dispatch("vnd.sun.star.autorecovery:/doSessionSave, async=true @@ -253,7 +253,7 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl args[0] = PropertyValue(OUString::createFromAscii("DispatchAsynchron"),-1,makeAny(sal_True),PropertyState_DIRECT_VALUE); xDispatch->dispatch(aURL, args); bDispatched = sal_True; - // on stop event set call m_rSessionManager->saveDone(this); + // on stop event set call m_rSessionManager->saveDone(this); } catch (com::sun::star::uno::Exception& e) { OString aMsg = OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8); OSL_ENSURE(sal_False, aMsg.getStr()); @@ -267,7 +267,7 @@ void SAL_CALL SessionListener::doSave( sal_Bool bShutdown, sal_Bool /*bCancelabl m_rSessionManager->saveDone( this ); } - + void SAL_CALL SessionListener::approveInteraction( sal_Bool /*bInteractionGranted*/ ) throw (RuntimeException) diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index f5991c9d86..730e022ab0 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -82,9 +82,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include @@ -541,7 +541,7 @@ throw ( RuntimeException ) ) bEnabledItem = sal_True; #endif - + // Enable/disable item if ( bEnabledItem != bMenuItemEnabled ) m_pVCLMenu->EnableItem( pMenuItemHandler->nItemId, bEnabledItem ); @@ -2104,7 +2104,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,AddonMenu* pAddonMen PopupMenu* pCtlPopupMenu = (PopupMenu *)pVCLXPopupMenu->GetMenu(); pAddonMenu->SetPopupMenu( pMenuItemHandler->nItemId, pCtlPopupMenu ); pMenuItemHandler->xPopupMenu = Reference< com::sun::star::awt::XPopupMenu >( (OWeakObject *)pVCLXPopupMenu, UNO_QUERY ); - + } } m_aMenuItemHandlerVector.push_back( pMenuItemHandler ); diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 7dc52b4f5a..fa90f0c161 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include //_________________________________________________________________________________________________________________ @@ -112,11 +112,11 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage { sal_Bool bImageSet( sal_False ); ::rtl::OUString aImageId; - + AddInfoForId::const_iterator pInfo = m_aAddInfoForItem.find( nItemId ); if ( pInfo != m_aAddInfoForItem.end() ) aImageId = pInfo->second.aImageId; // Retrieve image id for menu item - + if ( aImageId.getLength() > 0 ) { aImage = GetImageFromURL( xFrame, aImageId, FALSE, bHiContrast ); @@ -132,7 +132,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImage String aCmd( pPopupMenu->GetItemCommand( nItemId ) ); if ( aCmd.Len() ) aImage = GetImageFromURL( xFrame, aCmd, FALSE, bHiContrast ); - + if ( !!aImage ) pPopupMenu->SetItemImage( nItemId, aImage ); } @@ -149,7 +149,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const USHORT nId( 0 ); sal_Bool bFound( sal_False ); rtl::OUString aCommand; - + if ( m_aEmptyDocURL.getLength() > 0 ) { // Search for the empty document URL @@ -169,7 +169,7 @@ void NewMenuController::determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const } } } - + if ( !bFound ) { // Search for the default module name @@ -265,25 +265,25 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu ) aCmds.push_back( pPopupMenu->GetItemCommand( nId )); } } - + sal_uInt32 nSeqCount( aIds.size() ); if ( m_bNewMenu ) nSeqCount+=1; Sequence< rtl::OUString > aSeq( nSeqCount ); - + // Add a special command for our "New" menu. if ( m_bNewMenu ) { aSeq[nSeqCount-1] = m_aCommandURL; aMenuShortCuts.push_back( aEmptyKeyCode ); } - + const sal_uInt32 nCount = aCmds.size(); for ( sal_uInt32 i = 0; i < nCount; i++ ) aSeq[i] = aCmds[i]; - + if ( m_xGlobalAcceleratorManager.is() ) retrieveShortcutsFromConfiguration( xGlobalAccelCfg, aSeq, aMenuShortCuts ); if ( m_xModuleAcceleratorManager.is() ) @@ -305,7 +305,7 @@ void NewMenuController::setAccelerators( PopupMenu* pPopupMenu ) } } -void NewMenuController::retrieveShortcutsFromConfiguration( +void NewMenuController::retrieveShortcutsFromConfiguration( const Reference< XAcceleratorConfiguration >& rAccelCfg, const Sequence< rtl::OUString >& rCommands, std::vector< KeyCode >& aMenuShortCuts ) @@ -359,7 +359,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup { MenuConfiguration aMenuCfg( m_xServiceManager ); BmkMenu* pSubMenu( 0 ); - + if ( m_bNewMenu ) pSubMenu = (BmkMenu*)aMenuCfg.CreateBookmarkMenu( m_xFrame, BOOKMARK_NEWMENU ); else @@ -370,13 +370,13 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup Image aImage; AddInfo aAddInfo; - + // retrieve additional parameters from bookmark menu and // store it in a hash_map. for ( USHORT i = 0; i < pSubMenu->GetItemCount(); i++ ) { USHORT nItemId = pSubMenu->GetItemId( sal::static_int_cast( i ) ); - if (( nItemId != 0 ) && + if (( nItemId != 0 ) && ( pSubMenu->GetItemType( nItemId ) != MENUITEM_SEPARATOR )) { MenuConfiguration::Attributes* pBmkAttributes = (MenuConfiguration::Attributes *)(pSubMenu->GetUserValue( nItemId )); @@ -384,15 +384,15 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup { aAddInfo.aTargetFrame = pBmkAttributes->aTargetFrame; aAddInfo.aImageId = pBmkAttributes->aImageId; - + m_aAddInfoForItem.insert( AddInfoForId::value_type( nItemId, aAddInfo )); } } } - + if ( m_bShowImages ) setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast ); - + delete pSubMenu; } } @@ -489,8 +489,8 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R sal_Bool bHiContrast( rSettings.GetHighContrastMode() ); PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); - - if (( m_bShowImages != bShowImages ) || + + if (( m_bShowImages != bShowImages ) || ( m_bHiContrast != bHiContrast )) { m_bShowImages = bShowImages; @@ -498,7 +498,7 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R setMenuImages( pVCLPopupMenu, m_bShowImages, m_bHiContrast ); } - + setAccelerators( pVCLPopupMenu ); } } @@ -507,7 +507,7 @@ void SAL_CALL NewMenuController::activate( const css::awt::MenuEvent& ) throw (R // XPopupMenuController void NewMenuController::impl_setPopupMenu() { - + if ( m_xPopupMenu.is() ) fillPopupMenu( m_xPopupMenu ); diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 7ab450d59c..5bf8611801 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include //#include @@ -135,7 +135,7 @@ void RecentFilesMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > Reference< XStringWidth > xStringLength( new RecentFilesStringLength ); int nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength(); - + // New vnd.sun.star.popup: command URL to support direct dispatches const rtl::OUString aCmdPrefix( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.popup:RecentFileList?entry=" )); @@ -253,11 +253,11 @@ void RecentFilesMenuController::executeEntry( sal_Int32 nIndex ) xDispatchProvider = Reference< XDispatchProvider >( m_xFrame, UNO_QUERY ); xServiceManager = m_xServiceManager; aLock.unlock(); - + css::util::URL aTargetURL; Sequence< PropertyValue > aArgsList; - - if (( nIndex >= 0 ) && + + if (( nIndex >= 0 ) && ( nIndex < sal::static_int_cast( m_aRecentFilesItems.size() ))) { const RecentFile& rRecentFile = m_aRecentFilesItems[ nIndex ]; @@ -353,7 +353,7 @@ void SAL_CALL RecentFilesMenuController::select( const css::awt::MenuEvent& rEve VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( xPopupMenu ); if ( pPopupMenu ) executeEntry( rEvent.MenuId-1 ); - } + } } void SAL_CALL RecentFilesMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException) @@ -372,7 +372,7 @@ void RecentFilesMenuController::impl_setPopupMenu() void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeException) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -392,17 +392,17 @@ void SAL_CALL RecentFilesMenuController::updatePopupMenu() throw (RuntimeExcepti } // XDispatchProvider -Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( - const URL& aURL, - const ::rtl::OUString& /*sTarget*/, - sal_Int32 /*nFlags*/ ) +Reference< XDispatch > SAL_CALL RecentFilesMenuController::queryDispatch( + const URL& aURL, + const ::rtl::OUString& /*sTarget*/, + sal_Int32 /*nFlags*/ ) throw( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + if ( aURL.Complete.indexOf( m_aBaseURL ) == 0 ) return Reference< XDispatch >( static_cast< OWeakObject* >( this ), UNO_QUERY ); else @@ -410,13 +410,13 @@ throw( RuntimeException ) } // XDispatch -void SAL_CALL RecentFilesMenuController::dispatch( - const URL& aURL, - const Sequence< PropertyValue >& /*seqProperties*/ ) +void SAL_CALL RecentFilesMenuController::dispatch( + const URL& aURL, + const Sequence< PropertyValue >& /*seqProperties*/ ) throw( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -433,7 +433,7 @@ throw( RuntimeException ) { sal_Int32 nAddArgs = aURL.Complete.indexOf( '&', nEntryPos ); rtl::OUString aEntryArg; - + if ( nAddArgs < 0 ) aEntryArg = aURL.Complete.copy( nEntryPos ); else @@ -446,22 +446,22 @@ throw( RuntimeException ) } } -void SAL_CALL RecentFilesMenuController::addStatusListener( - const Reference< XStatusListener >& xControl, - const URL& aURL ) +void SAL_CALL RecentFilesMenuController::addStatusListener( + const Reference< XStatusListener >& xControl, + const URL& aURL ) throw( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); - + PopupMenuControllerBase::addStatusListener( xControl, aURL ); } void SAL_CALL RecentFilesMenuController::removeStatusListener( - const Reference< XStatusListener >& xControl, - const URL& aURL ) + const Reference< XStatusListener >& xControl, + const URL& aURL ) throw( RuntimeException ) { PopupMenuControllerBase::removeStatusListener( xControl, aURL ); diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 6d5add117e..042b907f81 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -85,7 +85,7 @@ //_________________________________________________________________________________________________________________ #include #include -#include +#include #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include #endif @@ -99,7 +99,7 @@ #include #include #include -#include +#include #include //_________________________________________________________________________________________________________________ @@ -344,7 +344,7 @@ void ToolBarManager::Destroy() /* #i99167# removed change for i93173 since there is some weird crash */ // #i93173# delete toolbar lazily as we can still be in one of its handlers m_pToolBar->doLazyDelete(); - + Link aEmpty; m_pToolBar->SetSelectHdl( aEmpty ); m_pToolBar->SetActivateHdl( aEmpty ); @@ -1388,7 +1388,7 @@ void ToolBarManager::RequestImages() // empty image. if ( !aImage ) aImage = QueryAddonsImage( aCmdURLSeq[i], bBigImages, m_bIsHiContrast ); - + pIter->second.nImageInfo = 1; // mark image as module based } else diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index f0359f3fba..86aad1a41c 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ #endif #include #include -#include +#include #include #include @@ -143,7 +143,7 @@ Reference< XLayoutManager > getLayoutManagerFromFrame( const Reference< XFrame > { Reference< XPropertySet > xPropSet( rFrame, UNO_QUERY ); Reference< XLayoutManager > xLayoutManager; - + try { xPropSet->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ))) >>= xLayoutManager; @@ -183,7 +183,7 @@ ToolbarsMenuController::~ToolbarsMenuController() { } -void ToolbarsMenuController::addCommand( +void ToolbarsMenuController::addCommand( Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& rLabel ) { USHORT nItemId = m_xPopupMenu->getItemCount()+1; @@ -193,11 +193,11 @@ void ToolbarsMenuController::addCommand( aLabel = getUINameFromCommand( rCommandURL ); else aLabel = rLabel; - + rPopupMenu->insertItem( nItemId, aLabel, 0, nItemId ); Reference< awt::XMenuExtended > xMenuExtended( m_xPopupMenu, UNO_QUERY ); xMenuExtended->setCommand( nItemId, rCommandURL ); - + bool bInternal = ( rCommandURL.indexOf( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STATIC_INTERNAL_CMD_PART ))) == 0); if ( !bInternal ) { @@ -206,10 +206,10 @@ void ToolbarsMenuController::addCommand( } vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + Image aImage; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); - + if ( rSettings.GetUseImagesInMenus() ) aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetHighContrastMode() ); @@ -407,8 +407,8 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r Sequence< Sequence< com::sun::star::beans::PropertyValue > > aSeqToolBars = m_xModuleCfgMgr->getUIElementsInfo( UIElementType::TOOLBAR ); fillHashMap( aSeqToolBars, aToolbarHashMap ); - } - + } + std::vector< ToolBarEntry > aSortedTbs; rtl::OUString aStaticCmdPart( RTL_CONSTASCII_USTRINGPARAM( STATIC_CMD_PART )); @@ -524,14 +524,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r sal_Bool bAddCommand( sal_True ); SvtCommandOptions aCmdOptions; rtl::OUString aConfigureToolbar( RTL_CONSTASCII_USTRINGPARAM( CONFIGURE_TOOLBARS )); - + if ( aCmdOptions.HasEntries( SvtCommandOptions::CMDOPTION_DISABLED )) { - if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, + if ( aCmdOptions.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CONFIGURE_TOOLBARS_CMD )))) bAddCommand = sal_False; } - + if ( bAddCommand ) { // Create command for configure @@ -777,7 +777,7 @@ void SAL_CALL ToolbarsMenuController::select( const css::awt::MenuEvent& rEvent } else { - // closing means: + // closing means: // hide and destroy element xLayoutManager->hideElement( aToolBarResName ); xLayoutManager->destroyElement( aToolBarResName ); @@ -833,7 +833,7 @@ void SAL_CALL ToolbarsMenuController::activate( const css::awt::MenuEvent& ) thr void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::XPopupMenu >& xPopupMenu ) throw ( RuntimeException ) { ResetableGuard aLock( m_aLock ); - + if ( m_bDisposed ) throw DisposedException(); @@ -841,13 +841,13 @@ void SAL_CALL ToolbarsMenuController::setPopupMenu( const Reference< css::awt::X { // Create popup menu on demand vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + m_xPopupMenu = xPopupMenu; m_xPopupMenu->addMenuListener( Reference< css::awt::XMenuListener >( (OWeakObject*)this, UNO_QUERY )); fillPopupMenu( m_xPopupMenu ); - } + } } - + // XInitialization void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException ) { @@ -856,14 +856,14 @@ void SAL_CALL ToolbarsMenuController::initialize( const Sequence< Any >& aArgume if ( !bInitalized ) { PopupMenuControllerBase::initialize(aArguments); - + if ( m_bInitialized ) { - Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( - SERVICENAME_MODULEMANAGER ), + Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( + SERVICENAME_MODULEMANAGER ), UNO_QUERY ); - Reference< XNameAccess > xPersistentWindowStateSupplier( m_xServiceManager->createInstance( - SERVICENAME_WINDOWSTATECONFIGURATION ), + Reference< XNameAccess > xPersistentWindowStateSupplier( m_xServiceManager->createInstance( + SERVICENAME_WINDOWSTATECONFIGURATION ), UNO_QUERY ); // Retrieve persistent window state reference for our module @@ -916,7 +916,7 @@ IMPL_STATIC_LINK_NOINSTANCE( ToolbarsMenuController, ExecuteHdl_Impl, ExecuteInf catch ( Exception& ) { } - + delete pExecuteInfo; return 0; } diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/lngprops.hxx index 41052f9eb1..4a104eed58 100644 --- a/linguistic/inc/lngprops.hxx +++ b/linguistic/inc/lngprops.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #ifndef _LINGUISTIC_LNGPROPS_HHX_ #define _LINGUISTIC_LNGPROPS_HHX_ -#include +#include // maximal number of suggestions to be returned in spelling context-menu // (may not include results added by looking up user dictionaries) @@ -41,24 +41,24 @@ //!! Don't change values! They are used as the property handles in //!! the service description #define WID_IS_GERMAN_PRE_REFORM UPH_IS_GERMAN_PRE_REFORM /*! deprecated !*/ -#define WID_IS_USE_DICTIONARY_LIST UPH_IS_USE_DICTIONARY_LIST +#define WID_IS_USE_DICTIONARY_LIST UPH_IS_USE_DICTIONARY_LIST #define WID_IS_IGNORE_CONTROL_CHARACTERS UPH_IS_IGNORE_CONTROL_CHARACTERS -#define WID_IS_SPELL_UPPER_CASE UPH_IS_SPELL_UPPER_CASE -#define WID_IS_SPELL_WITH_DIGITS UPH_IS_SPELL_WITH_DIGITS -#define WID_IS_SPELL_CAPITALIZATION UPH_IS_SPELL_CAPITALIZATION -#define WID_HYPH_MIN_LEADING UPH_HYPH_MIN_LEADING -#define WID_HYPH_MIN_TRAILING UPH_HYPH_MIN_TRAILING -#define WID_HYPH_MIN_WORD_LENGTH UPH_HYPH_MIN_WORD_LENGTH -#define WID_DEFAULT_LOCALE UPH_DEFAULT_LOCALE -#define WID_IS_SPELL_AUTO UPH_IS_SPELL_AUTO +#define WID_IS_SPELL_UPPER_CASE UPH_IS_SPELL_UPPER_CASE +#define WID_IS_SPELL_WITH_DIGITS UPH_IS_SPELL_WITH_DIGITS +#define WID_IS_SPELL_CAPITALIZATION UPH_IS_SPELL_CAPITALIZATION +#define WID_HYPH_MIN_LEADING UPH_HYPH_MIN_LEADING +#define WID_HYPH_MIN_TRAILING UPH_HYPH_MIN_TRAILING +#define WID_HYPH_MIN_WORD_LENGTH UPH_HYPH_MIN_WORD_LENGTH +#define WID_DEFAULT_LOCALE UPH_DEFAULT_LOCALE +#define WID_IS_SPELL_AUTO UPH_IS_SPELL_AUTO #define WID_IS_SPELL_HIDE UPH_IS_SPELL_HIDE /*! deprecated !*/ -#define WID_IS_SPELL_IN_ALL_LANGUAGES UPH_IS_SPELL_IN_ALL_LANGUAGES /*! deprecated !*/ -#define WID_IS_SPELL_SPECIAL UPH_IS_SPELL_SPECIAL -#define WID_IS_HYPH_AUTO UPH_IS_HYPH_AUTO -#define WID_IS_HYPH_SPECIAL UPH_IS_HYPH_SPECIAL -#define WID_IS_WRAP_REVERSE UPH_IS_WRAP_REVERSE -#define WID_DEFAULT_LANGUAGE UPH_DEFAULT_LANGUAGE -#define WID_DEFAULT_LOCALE_CJK UPH_DEFAULT_LOCALE_CJK +#define WID_IS_SPELL_IN_ALL_LANGUAGES UPH_IS_SPELL_IN_ALL_LANGUAGES /*! deprecated !*/ +#define WID_IS_SPELL_SPECIAL UPH_IS_SPELL_SPECIAL +#define WID_IS_HYPH_AUTO UPH_IS_HYPH_AUTO +#define WID_IS_HYPH_SPECIAL UPH_IS_HYPH_SPECIAL +#define WID_IS_WRAP_REVERSE UPH_IS_WRAP_REVERSE +#define WID_DEFAULT_LANGUAGE UPH_DEFAULT_LANGUAGE +#define WID_DEFAULT_LOCALE_CJK UPH_DEFAULT_LOCALE_CJK #define WID_DEFAULT_LOCALE_CTL UPH_DEFAULT_LOCALE_CTL #endif diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 803341bb8b..307fd2a16b 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #include // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include // helper for implementations -#include +#include #include #include #include @@ -89,7 +89,7 @@ namespace linguistic #define PATH_FLAG_WRITABLE 0x04 #define PATH_FLAG_ALL (PATH_FLAG_INTERNAL | PATH_FLAG_USER | PATH_FLAG_WRITABLE) - + // AddEntryToDic return values #define DIC_ERR_NONE 0 #define DIC_ERR_FULL 1 @@ -138,7 +138,7 @@ LanguageType LangSeqToLocaleSeq( const ::com::sun::star::uno::Sequence< INT16 > &rLangSeq ); ::com::sun::star::uno::Sequence< INT16 > - LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< + LocaleSeqToLangSeq( ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > &rLocaleSeq ); /////////////////////////////////////////////////////////////////////////// @@ -179,7 +179,7 @@ INT32 GetPosInWordToCheck( const rtl::OUString &rTxt, INT32 nPos ); ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > - RebuildHyphensAndControlChars( const rtl::OUString &rOrigWord, + RebuildHyphensAndControlChars( const rtl::OUString &rOrigWord, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > &rxHyphWord ); @@ -210,24 +210,24 @@ BOOL IsNumeric( const String &rText ); /////////////////////////////////////////////////////////////////////////// BOOL IsUseDicList( const ::com::sun::star::beans::PropertyValues &rProperties, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rxPropSet ); BOOL IsIgnoreControlChars( const ::com::sun::star::beans::PropertyValues &rProperties, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &rxPropSet ); -::com::sun::star::uno::Reference< +::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > - SearchDicList( + SearchDicList( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList >& rDicList, - const ::rtl::OUString& rWord, INT16 nLanguage, + const ::rtl::OUString& rWord, INT16 nLanguage, BOOL bSearchPosDics, BOOL bSearchSpellEntry ); -sal_uInt8 AddEntryToDic( +sal_uInt8 AddEntryToDic( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > &rxDic, const ::rtl::OUString &rWord, sal_Bool bIsNeg, - const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang, + const ::rtl::OUString &rRplcTxt, sal_Int16 nRplcLang, sal_Bool bStripDot = sal_True ); sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryList > &xDicList ); @@ -241,7 +241,7 @@ sal_Bool SaveDictionaries( const ::com::sun::star::uno::Reference< ::com::sun::s class AppExitListener : public cppu::WeakImplHelper1 - < + < ::com::sun::star::frame::XTerminateListener > { diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 1d5729b34b..decb46f35c 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -98,7 +98,7 @@ String GetConvDicMainURL( const String &rDicName, const String &rDirectoryURL ) DBG_ASSERT(!aURLObj.HasError(), "invalid URL"); if (aURLObj.HasError()) return String(); - else + else return aURLObj.GetMainURL( INetURLObject::DECODE_TO_IURI ); } @@ -139,7 +139,7 @@ public: virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - + // looks for conversion dictionaries with the specified extension // in the directory and adds them to the container void AddConvDics( const String &rSearchDirPathURL, const String &rExtension ); @@ -149,10 +149,10 @@ public: INT32 GetCount() const { return aConvDics.getLength(); } uno::Reference< XConversionDictionary > GetByName( const OUString& rName ); - + const uno::Reference< XConversionDictionary > GetByIndex( INT32 nIdx ) - { - return aConvDics.getConstArray()[nIdx]; + { + return aConvDics.getConstArray()[nIdx]; } }; @@ -190,7 +190,7 @@ void ConvDicNameContainer::FlushDics() const } -INT32 ConvDicNameContainer::GetIndexByName_Impl( +INT32 ConvDicNameContainer::GetIndexByName_Impl( const OUString& rName ) { INT32 nRes = -1; @@ -205,7 +205,7 @@ INT32 ConvDicNameContainer::GetIndexByName_Impl( } -uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName( +uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName( const OUString& rName ) { uno::Reference< XConversionDictionary > xRes; @@ -216,7 +216,7 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName( } -uno::Type SAL_CALL ConvDicNameContainer::getElementType( ) +uno::Type SAL_CALL ConvDicNameContainer::getElementType( ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -224,7 +224,7 @@ uno::Type SAL_CALL ConvDicNameContainer::getElementType( ) } -sal_Bool SAL_CALL ConvDicNameContainer::hasElements( ) +sal_Bool SAL_CALL ConvDicNameContainer::hasElements( ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -232,7 +232,7 @@ sal_Bool SAL_CALL ConvDicNameContainer::hasElements( ) } -uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) +uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -243,7 +243,7 @@ uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) } -uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) +uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -258,7 +258,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) } -sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) +sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -266,9 +266,9 @@ sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) } -void SAL_CALL ConvDicNameContainer::replaceByName( - const OUString& rName, - const uno::Any& rElement ) +void SAL_CALL ConvDicNameContainer::replaceByName( + const OUString& rName, + const uno::Any& rElement ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -284,27 +284,27 @@ void SAL_CALL ConvDicNameContainer::replaceByName( } -void SAL_CALL ConvDicNameContainer::insertByName( - const OUString& rName, - const Any& rElement ) +void SAL_CALL ConvDicNameContainer::insertByName( + const OUString& rName, + const Any& rElement ) throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - + if (GetByName( rName ).is()) throw ElementExistException(); uno::Reference< XConversionDictionary > xNew; rElement >>= xNew; if (!xNew.is() || xNew->getName() != rName) throw IllegalArgumentException(); - + INT32 nLen = aConvDics.getLength(); aConvDics.realloc( nLen + 1 ); aConvDics.getArray()[ nLen ] = xNew; } -void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) +void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -345,11 +345,11 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) } -void ConvDicNameContainer::AddConvDics( - const String &rSearchDirPathURL, +void ConvDicNameContainer::AddConvDics( + const String &rSearchDirPathURL, const String &rExtension ) { - const Sequence< OUString > aDirCnt( + const Sequence< OUString > aDirCnt( utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, FALSE ) ); const OUString *pDirCnt = aDirCnt.getConstArray(); INT32 nEntries = aDirCnt.getLength(); @@ -372,8 +372,8 @@ void ConvDicNameContainer::AddConvDics( { // get decoded dictionary file name INetURLObject aURLObj( aURL ); - String aDicName = aURLObj.getBase( INetURLObject::LAST_SEGMENT, - true, INetURLObject::DECODE_WITH_CHARSET, + String aDicName = aURLObj.getBase( INetURLObject::LAST_SEGMENT, + true, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 ); uno::Reference < XConversionDictionary > xDic; @@ -408,7 +408,7 @@ class StaticWithInit_ { public: /** Gets the static. Mutual exclusion is performed using the osl global mutex. - + @return static variable */ @@ -466,7 +466,7 @@ ConvDicList::~ConvDicList() if (!bDisposing && pNameContainer) pNameContainer->FlushDics(); - + pExitListener->Deactivate(); } @@ -485,7 +485,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer() if (!pNameContainer) { pNameContainer = new ConvDicNameContainer( *this ); - pNameContainer->AddConvDics( GetDictionaryWriteablePath(), + pNameContainer->AddConvDics( GetDictionaryWriteablePath(), A2OU( CONV_DIC_EXT ) ); xNameContainer = pNameContainer; @@ -496,7 +496,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer() const OUString *pActiveConvDics = aOpt.aActiveConvDics.getConstArray(); for (INT32 i = 0; i < nLen; ++i) { - uno::Reference< XConversionDictionary > xDic = + uno::Reference< XConversionDictionary > xDic = pNameContainer->GetByName( pActiveConvDics[i] ); if (xDic.is()) xDic->setActive( sal_True ); @@ -527,10 +527,10 @@ uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryC } -uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( - const OUString& rName, - const Locale& rLocale, - sal_Int16 nConvDicType ) +uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( + const OUString& rName, + const Locale& rLocale, + sal_Int16 nConvDicType ) throw (NoSupportException, ElementExistException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -539,7 +539,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( if (GetNameContainer().hasByName( rName )) throw ElementExistException(); - + uno::Reference< XConversionDictionary > xRes; String aDicMainURL( GetConvDicMainURL( rName, GetDictionaryWriteablePath() ) ); if (nLang == LANGUAGE_KOREAN && @@ -552,7 +552,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( { xRes = new ConvDic( rName, nLang, nConvDicType, FALSE, aDicMainURL ); } - + if (!xRes.is()) throw NoSupportException(); else @@ -566,20 +566,20 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( } -uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( - const OUString& rText, - sal_Int32 nStartPos, - sal_Int32 nLength, - const Locale& rLocale, - sal_Int16 nConversionDictionaryType, - ConversionDirection eDirection, - sal_Int32 nTextConversionOptions ) +uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( + const OUString& rText, + sal_Int32 nStartPos, + sal_Int32 nLength, + const Locale& rLocale, + sal_Int16 nConversionDictionaryType, + ConversionDirection eDirection, + sal_Int32 nTextConversionOptions ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); /*INT16 nLang = LocaleToLanguage( rLocale );*/ - + INT32 nCount = 0; uno::Sequence< OUString > aRes( 20 ); OUString *pRes = aRes.getArray(); @@ -595,7 +595,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( bSupported |= bMatch; if (bMatch && xDic->isActive()) { - Sequence< OUString > aNewConv( xDic->getConversions( + Sequence< OUString > aNewConv( xDic->getConversions( rText, nStartPos, nLength, eDirection, nTextConversionOptions ) ); INT32 nNewLen = aNewConv.getLength(); @@ -621,21 +621,21 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( } -sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( - const Locale& rLocale, - sal_Int16 nConversionDictionaryType, - ConversionDirection eDirection ) +sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( + const Locale& rLocale, + sal_Int16 nConversionDictionaryType, + ConversionDirection eDirection ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); - + sal_Int16 nRes = 0; GetNameContainer(); INT32 nLen = GetNameContainer().GetCount(); for (INT32 i = 0; i < nLen; ++i) { const uno::Reference< XConversionDictionary > xDic( GetNameContainer().GetByIndex(i) ); - if (xDic.is() && + if (xDic.is() && xDic->getLocale() == rLocale && xDic->getConversionType() == nConversionDictionaryType) { @@ -648,7 +648,7 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( } -void SAL_CALL ConvDicList::dispose( ) +void SAL_CALL ConvDicList::dispose( ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -663,8 +663,8 @@ void SAL_CALL ConvDicList::dispose( ) } -void SAL_CALL ConvDicList::addEventListener( - const uno::Reference< XEventListener >& rxListener ) +void SAL_CALL ConvDicList::addEventListener( + const uno::Reference< XEventListener >& rxListener ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -673,8 +673,8 @@ void SAL_CALL ConvDicList::addEventListener( } -void SAL_CALL ConvDicList::removeEventListener( - const uno::Reference< XEventListener >& rxListener ) +void SAL_CALL ConvDicList::removeEventListener( + const uno::Reference< XEventListener >& rxListener ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -683,7 +683,7 @@ void SAL_CALL ConvDicList::removeEventListener( } -OUString SAL_CALL ConvDicList::getImplementationName( ) +OUString SAL_CALL ConvDicList::getImplementationName( ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -691,7 +691,7 @@ OUString SAL_CALL ConvDicList::getImplementationName( ) } -sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) +sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -699,7 +699,7 @@ sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) } -uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames( ) +uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames( ) throw (RuntimeException) { MutexGuard aGuard( GetLinguMutex() ); @@ -707,7 +707,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames( ) } -uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() +uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() throw() { uno::Sequence< OUString > aSNS( 1 ); @@ -718,7 +718,7 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static() /////////////////////////////////////////////////////////////////////////// -uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( +uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ ) throw(Exception) { @@ -750,7 +750,7 @@ sal_Bool SAL_CALL ConvDicList_writeInfo( } -void * SAL_CALL ConvDicList_getFactory( +void * SAL_CALL ConvDicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 0436504c2b..044bb0a845 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include // helper for factories @@ -317,9 +317,9 @@ DicList::~DicList() } -void DicList::SearchForDictionaries( +void DicList::SearchForDictionaries( DictionaryVec_t&rDicList, - const String &rDicDirURL, + const String &rDicDirURL, BOOL bIsWriteablePath ) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -374,10 +374,10 @@ void DicList::SearchForDictionaries( { // get decoded dictionary file name INetURLObject aURLObj( aURL ); - String aDicName = aURLObj.getName( INetURLObject::LAST_SEGMENT, - true, INetURLObject::DECODE_WITH_CHARSET, + String aDicName = aURLObj.getName( INetURLObject::LAST_SEGMENT, + true, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 ); - + DictionaryType eType = bNeg ? DictionaryType_NEGATIVE : DictionaryType_POSITIVE; uno::Reference< XDictionary > xDic = new DictionaryNeo( aDicName, nLang, eType, aURL, bIsWriteablePath ); @@ -686,8 +686,8 @@ void DicList::_CreateDicList() xIgnAll->setActive( TRUE ); addDictionary( xIgnAll ); } - - + + // evaluate list of dictionaries to be activated from configuration // //! to suppress overwriting the list of active dictionaries in the @@ -707,11 +707,11 @@ void DicList::_CreateDicList() xDic->setActive( TRUE ); } } - + // suppress collected events during creation of the dictionary list. // there should be no events during creation. pDicEvtLstnrHelper->ClearEvents(); - + pDicEvtLstnrHelper->EndCollectEvents(); bInCreation = FALSE; @@ -932,11 +932,11 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg ) // get stream to be used SfxMedium aMedium( rFileURL, STREAM_READ | STREAM_SHARE_DENYWRITE, FALSE ); SvStream *pStream = aMedium.GetInStream(); - + int nDicVersion = ReadDicVersion (pStream, nLng, bNeg); if (2 == nDicVersion || nDicVersion >= 5) return TRUE; - + return FALSE; } diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index fc6f4c7cc3..903afa2448 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include "lngprops.hxx" #include "misc.hxx" #include -#include +#include #include #include // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type @@ -338,7 +338,7 @@ const SfxItemPropertyMapEntry* lcl_GetLinguProps() &::getCppuType( (sal_Int16*)0 ), 0, 0 }, { MAP_CHAR_LEN(UPN_HYPH_MIN_WORD_LENGTH), WID_HYPH_MIN_WORD_LENGTH, &::getCppuType( (sal_Int16*)0 ), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_GERMAN_PRE_REFORM), WID_IS_GERMAN_PRE_REFORM, /*! deprecated !*/ + { MAP_CHAR_LEN(UPN_IS_GERMAN_PRE_REFORM), WID_IS_GERMAN_PRE_REFORM, /*! deprecated !*/ &::getBooleanCppuType(), 0, 0 }, { MAP_CHAR_LEN(UPN_IS_HYPH_AUTO), WID_IS_HYPH_AUTO, &::getBooleanCppuType(), 0, 0 }, @@ -350,9 +350,9 @@ const SfxItemPropertyMapEntry* lcl_GetLinguProps() &::getBooleanCppuType(), 0, 0 }, { MAP_CHAR_LEN(UPN_IS_SPELL_CAPITALIZATION), WID_IS_SPELL_CAPITALIZATION, &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_HIDE), WID_IS_SPELL_HIDE, /*! deprecated !*/ + { MAP_CHAR_LEN(UPN_IS_SPELL_HIDE), WID_IS_SPELL_HIDE, /*! deprecated !*/ &::getBooleanCppuType(), 0, 0 }, - { MAP_CHAR_LEN(UPN_IS_SPELL_IN_ALL_LANGUAGES), WID_IS_SPELL_IN_ALL_LANGUAGES, /*! deprecated !*/ + { MAP_CHAR_LEN(UPN_IS_SPELL_IN_ALL_LANGUAGES), WID_IS_SPELL_IN_ALL_LANGUAGES, /*! deprecated !*/ &::getBooleanCppuType(), 0, 0 }, { MAP_CHAR_LEN(UPN_IS_SPELL_SPECIAL), WID_IS_SPELL_SPECIAL, &::getBooleanCppuType(), 0, 0 }, diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 2188ef4d88..63a4f63a98 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -87,7 +87,7 @@ public: BOOL SetValue( ::com::sun::star::uno::Any &rOld, const ::com::sun::star::uno::Any &rVal, INT32 nWID ); void GetValue( ::com::sun::star::uno::Any &rVal, INT32 nWID ) const; - + static ::rtl::OUString GetName( INT32 nWID ); const ::com::sun::star::uno::Sequence< rtl::OUString > diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 2a70e9eeb1..e5d9a39d19 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include #include @@ -134,7 +134,7 @@ static uno::Sequence< lang::Locale > GetAvailLocales( aLanguages.insert( nLang ); } } - else + else { DBG_ASSERT( 0, "interface not supported by service" ); } @@ -753,7 +753,7 @@ void LngSvcMgr::Notify( const uno::Sequence< OUString > &rPropertyNames ) pThesDsp->SetServiceList( CreateLocale(nLang), aSvcImplNames ); } } - else + else { DBG_ASSERT( 0, "nofified for unexpected property" ); } @@ -801,9 +801,9 @@ void LngSvcMgr::GetGrammarCheckerDsp_Impl( sal_Bool bSetSvcList ) uno::Reference< linguistic2::XProofreadingIterator > xGCI; try { - uno::Reference< lang::XMultiServiceFactory > xMgr( + uno::Reference< lang::XMultiServiceFactory > xMgr( utl::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); - xGCI = uno::Reference< linguistic2::XProofreadingIterator >( + xGCI = uno::Reference< linguistic2::XProofreadingIterator >( xMgr->createInstance( A2OU( SN_GRAMMARCHECKINGITERATOR ) ), uno::UNO_QUERY_THROW ); } catch (uno::Exception &) @@ -887,7 +887,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl() DBG_ASSERT( 0, "createInstance failed" ); } } - + if (xSvc.is()) { OUString aImplName; @@ -953,7 +953,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl() DBG_ASSERT( 0, "createInstance failed" ); } } - + if (xSvc.is()) { OUString aImplName; @@ -1671,7 +1671,7 @@ BOOL LngSvcMgr::SaveCfgSvcs( const String &rServiceName ) pNodeName = "ServiceManager/HyphenatorList"; else if (pDsp == pThesDsp) pNodeName = "ServiceManager/ThesaurusList"; - else + else { DBG_ASSERT( 0, "node name missing" ); } @@ -1765,7 +1765,7 @@ static uno::Sequence< OUString > GetLangSvc( const uno::Any &rVal ) aRes.realloc(1); aRes.getArray()[0] = aImplName; } - else + else { DBG_ASSERT( 0, "GetLangSvc: unexpected type encountered" ); } diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 2df19215fd..d54a5b278a 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -90,10 +90,10 @@ osl::Mutex & GetLinguMutex() LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang ) { - static LocaleDataWrapper aLclDtaWrp( - getProcessServiceFactory(), + static LocaleDataWrapper aLclDtaWrp( + getProcessServiceFactory(), CreateLocale( Application::GetSettings().GetUILanguage() ) ); - + const Locale &rLcl = aLclDtaWrp.getLoadedLocale(); Locale aLcl( CreateLocale( nLang ) ); if (aLcl.Language != rLcl.Language || @@ -243,8 +243,8 @@ sal_Int32 LevDistance( const OUString &rTxt1, const OUString &rTxt2 ) sal_Unicode c1i = rTxt1.getStr()[i - 1]; sal_Unicode c2k = rTxt2.getStr()[k - 1]; sal_Int32 nCost = c1i == c2k ? 0 : 1; - sal_Int32 nNew = Minimum( aData.Value(i-1, k ) + 1, - aData.Value(i , k-1) + 1, + sal_Int32 nNew = Minimum( aData.Value(i-1, k ) + 1, + aData.Value(i , k-1) + 1, aData.Value(i-1, k-1) + nCost ); // take transposition (exchange with left or right char) in account if (2 < i && 2 < k) @@ -798,7 +798,7 @@ sal_Unicode ToUpper( const sal_Unicode cChar, INT16 nLanguage ) // sorted(!) array of unicode ranges for code points that are exclusively(!) used as numbers // and thus may NOT not be part of names or words like the Chinese/Japanese number characters -static const sal_uInt32 the_aDigitZeroes [] = +static const sal_uInt32 the_aDigitZeroes [] = { 0x00000030, //0039 ; Decimal # Nd [10] DIGIT ZERO..DIGIT NINE 0x00000660, //0669 ; Decimal # Nd [10] ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index 297366322f..ffd54b78f8 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -63,7 +63,7 @@ BOOL FileExists( const String &rMainURL ) { try { - ::ucbhelper::Content aContent( rMainURL, + ::ucbhelper::Content aContent( rMainURL, uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >()); bExists = aContent.isDocument(); } @@ -99,7 +99,7 @@ String GetFileURL( SvtPathOptions::Pathes ePath, const String &rFileName ) String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim ) { String aRes; - + SvtPathOptions aPathOpt; switch (ePath) { @@ -131,7 +131,7 @@ String GetModulePath( SvtPathOptions::Pathes ePath, BOOL bAddAccessDelim ) aRes += '/'; #endif } - + return aRes; } @@ -146,7 +146,7 @@ rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) sal_Int32 nIdx = nTxtLen - 1; while (nIdx >= 0 && rTxt[ nIdx-- ] == cChar) ++nTrailing; - + rtl::OUString aRes( rTxt.copy( nTxtLen - nTrailing ) ); rTxt = rTxt.copy( 0, nTxtLen - nTrailing ); return aRes; @@ -154,7 +154,7 @@ rtl::OUString StripTrailingChars( rtl::OUString &rTxt, sal_Unicode cChar ) /////////////////////////////////////////////////////////////////////////// -static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( +static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( const rtl::OUString &rPathPrefix, sal_Int16 nPathFlags ) { @@ -162,7 +162,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( uno::Sequence< rtl::OUString > aInternalPaths; uno::Sequence< rtl::OUString > aUserPaths; rtl::OUString aWritablePath; - + bool bSuccess = true; uno::Reference< lang::XMultiServiceFactory > xMgr( utl::getProcessServiceFactory() ); if (xMgr.is()) @@ -176,7 +176,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( aUser .AppendAscii( "_user" ); aWriteable.AppendAscii( "_writable" ); - uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance( + uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance( A2OU( "com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY_THROW ); xPathSettings->getPropertyValue( aInternal ) >>= aInternalPaths; xPathSettings->getPropertyValue( aUser ) >>= aUserPaths; @@ -185,7 +185,7 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( catch (uno::Exception &) { bSuccess = false; - } + } } if (bSuccess) { @@ -211,10 +211,10 @@ static uno::Sequence< rtl::OUString > GetMultiPaths_Impl( const bool bAddInternal = &rPathSeq == &aInternalPaths && (nPathFlags & PATH_FLAG_INTERNAL); if ((bAddUser || bAddInternal) && pPathSeq[k].getLength() > 0) pRes[ nCount++ ] = pPathSeq[k]; - } - } + } + } aRes.realloc( nCount ); - } + } return aRes; } @@ -227,17 +227,17 @@ rtl::OUString GetDictionaryWriteablePath() if (aPaths.getLength() > 0) aRes = aPaths[0]; return aRes; -} +} uno::Sequence< rtl::OUString > GetDictionaryPaths( sal_Int16 nPathFlags ) { return GetMultiPaths_Impl( A2OU("Dictionary"), nPathFlags ); } - + uno::Sequence< rtl::OUString > GetLinguisticPaths( sal_Int16 nPathFlags ) { return GetMultiPaths_Impl( A2OU("Linguistic"), nPathFlags ); -} +} String GetWritableDictionaryURL( const String &rDicName ) { @@ -256,12 +256,12 @@ String GetWritableDictionaryURL( const String &rDicName ) } -String SearchFileInPaths( - const String &rFile, +String SearchFileInPaths( + const String &rFile, const uno::Sequence< rtl::OUString > &rPaths ) { //!! see also SvtPathOptions::SearchFile for the riginal code - + String aRes; // check in all paths... @@ -295,7 +295,7 @@ String SearchFileInPaths( } return aRes; -} +} } // namespace linguistic diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 073deaa45f..07483990a6 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -503,20 +503,20 @@ #include "svtools/cstitem.hxx" #include "svtools/ctypeitm.hxx" #include "svtools/dateitem.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" #include "svtools/eitem.hxx" #include "svtools/embedhlp.hxx" #include "svtools/embedtransfer.hxx" -#include "svtools/eventcfg.hxx" -#include "svtools/extendedsecurityoptions.hxx" +#include "unotools/eventcfg.hxx" +#include "unotools/extendedsecurityoptions.hxx" #include "svtools/flagitem.hxx" #include "svtools/folderrestriction.hxx" -#include "svtools/fontoptions.hxx" +#include "unotools/fontoptions.hxx" #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" #include "svtools/hint.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/htmltokn.h" #include "svtools/imageitm.hxx" @@ -526,10 +526,10 @@ #include "svtools/inetdef.hxx" #include "svtools/inethist.hxx" #include "svtools/inetmsg.hxx" -#include "svtools/inetoptions.hxx" +#include "unotools/inetoptions.hxx" #include "svtools/inetstrm.hxx" #include "svtools/inettype.hxx" -#include "svtools/internaloptions.hxx" +#include "unotools/internaloptions.hxx" #include "svtools/intitem.hxx" #include "svtools/isethint.hxx" #include "svtools/itemdel.hxx" @@ -539,32 +539,32 @@ #include "svtools/itemset.hxx" #include "svtools/javacontext.hxx" #include "svtools/lckbitem.hxx" -#include "svtools/localisationoptions.hxx" +#include "unotools/localisationoptions.hxx" #include "svtools/localresaccess.hxx" #include "svtools/lstner.hxx" #include "svtools/memberid.hrc" #include "svtools/menuoptions.hxx" #include "svtools/misccfg.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/ownlist.hxx" #include "svtools/parhtml.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/pickerhelper.hxx" #include "svtools/poolitem.hxx" #include "svtools/printoptions.hxx" -#include "svtools/printwarningoptions.hxx" +#include "unotools/printwarningoptions.hxx" #include "svtools/rectitem.hxx" -#include "svtools/regoptions.hxx" -#include "svtools/saveopt.hxx" -#include "svtools/searchopt.hxx" -#include "svtools/securityoptions.hxx" +#include "unotools/regoptions.hxx" +#include "unotools/saveopt.hxx" +#include "unotools/searchopt.hxx" +#include "unotools/securityoptions.hxx" #include "svtools/sfxecode.hxx" #include "svtools/slstitm.hxx" #include "svtools/smplhint.hxx" #include "svtools/soerr.hxx" #include "svtools/solar.hrc" -#include "svtools/startoptions.hxx" +#include "unotools/startoptions.hxx" #include "svtools/statusbarcontroller.hxx" #include "svtools/stritem.hxx" #include "svtools/style.hrc" @@ -582,14 +582,14 @@ #include "svtools/transfer.hxx" #include "svtools/ttprops.hxx" #include "svtools/undo.hxx" -#include "svtools/undoopt.hxx" +#include "unotools/undoopt.hxx" #include "svtools/urihelper.hxx" #include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/useroptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/visitem.hxx" #include "svtools/whiter.hxx" -#include "svtools/workingsetoptions.hxx" +#include "unotools/workingsetoptions.hxx" #include "svtools/zforlist.hxx" #include "toolkit/awt/vclxwindow.hxx" #include "toolkit/helper/convert.hxx" diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index 60255b4b21..f0b5903be3 100644 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include "sfx2/dllapi.h" #include #include -#include +#include #include #include diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 4cdc9ea5ee..c72d792244 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -136,29 +136,28 @@ #define DDE_AVAILABLE #endif -#include -#include +#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include using namespace ::com::sun::star; diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index a7d965a097..194c2b6afd 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 172c584c93..28f2fa072a 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,12 +68,12 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 45e1e23d55..0386129c6d 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include #include -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index a995006238..34fc074e52 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include #include #ifndef _SV_RESARY_HXX #include @@ -60,9 +60,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include @@ -106,7 +106,7 @@ namespace css = ::com::sun::star; class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateListener, XServiceInfo > { public: - + // XTerminateListener virtual void SAL_CALL queryTermination( const EventObject& aEvent ) throw( TerminationVetoException, RuntimeException ); virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) throw( RuntimeException ); diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 0734b18ec6..96cf2a70e7 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 94c2c28455..9a4883282b 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #ifndef _COM_SUN_STAR_BEANS_PropertyValue_HPP_ #include @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include "sfxresid.hxx" diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 17b7b432eb..c0065bea75 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -75,11 +75,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 75dd23c9bd..4dfdbb90b2 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #endif #include -#include +#include #include #ifndef GCC diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 7a70f6f094..cc70813d53 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -84,9 +84,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -1209,7 +1209,7 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet) { case SID_ONLINE_REGISTRATION: { - ::svt::RegOptions aOptions; + ::utl::RegOptions aOptions; if ( !aOptions.allowMenu() ) rSet.DisableItem( SID_ONLINE_REGISTRATION ); } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index ae8f0e6abe..605af8e770 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #ifndef _RCID_H #include #endif -#include +#include #include #include #include diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 9e0c8a1da3..54c0951c33 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,10 +95,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -3131,11 +3131,11 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin String aNewTitle = sTitle; aNewTitle += DEFINE_CONST_UNICODE(" - "); aNewTitle += pIndexWin->GetActiveFactoryTitle(); - + Reference< XTitle > xTitle(xFrame, UNO_QUERY); if (xTitle.is ()) xTitle->setTitle (aNewTitle); - + if ( pWin ) ShowStartPage(); pIndexWin->ClearSearchPage(); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index c32dc800ad..a36e45f0c5 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace com { namespace sun { namespace star { namespace text { class XTextRan #include #include #include -#include +#include #include "srchdlg.hxx" diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index f9b2777852..baaac7e57a 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -56,12 +56,12 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index c571b921b8..8984347187 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,8 +32,8 @@ #include "precompiled_sfx2.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/shutdowniconOs2.cxx b/sfx2/source/appl/shutdowniconOs2.cxx index ae2c80b2a7..d4876acb5d 100644 --- a/sfx2/source/appl/shutdowniconOs2.cxx +++ b/sfx2/source/appl/shutdowniconOs2.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,9 +29,9 @@ ************************************************************************/ -#include +#include -#include +#include #include "shutdownicon.hxx" #include @@ -71,9 +71,9 @@ void ShutdownIcon::SetAutostartOs2( bool bActivate ) if( bActivate && IsQuickstarterInstalled() ) { // place quickstart shadow in the startup folder - hObject = WinCreateObject( "WPShadow", "dummy", - "OBJECTID=<" QUICKSTART_OBJID "_SHW>;SHADOWID=<" QUICKSTART_OBJID ">;", - "", + hObject = WinCreateObject( "WPShadow", "dummy", + "OBJECTID=<" QUICKSTART_OBJID "_SHW>;SHADOWID=<" QUICKSTART_OBJID ">;", + "", CO_UPDATEIFEXISTS); } else diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 44df4b42be..b9799f5818 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -1,9 +1,9 @@ #ifdef ENABLE_QUICKSTART_APPLET -#include +#include -#include +#include #include #include @@ -158,7 +158,7 @@ static void add_item( GtkMenuShell *pMenuShell, const char *pAsciiURL, GtkWidget *pMenuItem = gtk_image_menu_item_new_with_label( aLabel ); gtk_image_menu_item_set_image( GTK_IMAGE_MENU_ITEM( pMenuItem ), pImage ); - g_signal_connect_data( pMenuItem, "activate", pFnCallback, pURL, + g_signal_connect_data( pMenuItem, "activate", pFnCallback, pURL, oustring_delete, GConnectFlags(0)); gtk_menu_shell_append( pMenuShell, pMenuItem ); @@ -376,7 +376,7 @@ void SAL_DLLPUBLIC_EXPORT plugin_init_sys_tray() pVCLResMgr = CREATEVERSIONRESMGR( vcl ); - GdkPixbuf *pPixbuf = ResIdToPixbuf( SV_ICON_ID_OFFICE ); + GdkPixbuf *pPixbuf = ResIdToPixbuf( SV_ICON_ID_OFFICE ); gtk_image_set_from_pixbuf( GTK_IMAGE( pIconImage ), pPixbuf ); g_object_unref( pPixbuf ); diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index 53bbc380ad..80df524dbe 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ // necessary to include system headers without warnings #ifdef _MSC_VER -#pragma warning(disable:4668 4917) +#pragma warning(disable:4668 4917) #endif // Support Windows 95 too @@ -45,9 +45,9 @@ // // the systray icon is only available on windows // -#include -#include +#include +#include #include "shutdownicon.hxx" #include "app.hrc" @@ -951,7 +951,7 @@ void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut ) OUString quickstartExe(aOfficepath); quickstartExe += OUString( RTL_CONSTASCII_USTRINGPARAM( "\\quickstart.exe" ) ); - + CreateShortcut( quickstartExe, aOfficepath, aShortcut, OUString(), OUString() ); } diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 9f944e01b4..82bb158301 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,8 +97,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index ec52cacbeb..be222b98f1 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include #ifndef _RTL_USTRING_ #include diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index b86c5b5e2f..0518435434 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include #include -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx index 1af26b9c38..62c9e22fac 100644 --- a/sfx2/source/control/srchitem.cxx +++ b/sfx2/source/control/srchitem.cxx @@ -36,7 +36,7 @@ #ifndef __SBX_SBXVARIABLE_HXX #include #endif -#include +#include #include #include #include diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index 5ed5569ea3..f7f3f7b14e 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -38,7 +38,7 @@ #include "alienwarn.hrc" #include "dialog.hrc" #include -#include +#include // class SfxAlienWarningDialog ------------------------------------------- diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index d93a4884c1..e715063509 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index d59d36855c..df3d4222f1 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 4bf2a95cc4..5c57b91c84 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -71,15 +71,15 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/dialog/intro.cxx b/sfx2/source/dialog/intro.cxx index 5ad3254a87..07f20b0801 100644 --- a/sfx2/source/dialog/intro.cxx +++ b/sfx2/source/dialog/intro.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 5d812751e8..d2f47233e5 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ #include #include #include -#include +#include #include #include #include @@ -176,7 +176,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( try { uno::Sequence < beans::PropertyValue > aProps; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG = + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xFilterCFG = uno::Reference< container::XNameAccess >( xSMGR->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ), uno::UNO_QUERY ); @@ -184,7 +184,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( if ( !xFilterCFG.is() ) return eRet; - + uno::Any aAny = xFilterCFG->getByName( rFilterName ); if ( aAny >>= aProps ) @@ -207,26 +207,26 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { uno::Sequence< beans::PropertyValue > aPropsForDialog(1); uno::Reference< document::XExporter > xExporter( xFilterDialog, uno::UNO_QUERY ); - + if ( rType.equalsAsciiL( PDF_DOCUMENT_TYPE, PDF_DOCUMENT_TYPE_LEN )) { //add an internal property, used to tell the dialog we want to set a different //string for the ok button //used in filter/source/pdf/impdialog.cxx String aOkSendText( SfxResId( STR_PDF_EXPORT_SEND )); - + uno::Sequence< beans::PropertyValue > aFilterDataValue(1); aFilterDataValue[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_OkButtonString" )); aFilterDataValue[0].Value = css::uno::makeAny( ::rtl::OUString( aOkSendText )); - + //add to the filterdata property, the only one the PDF export filter dialog will care for aPropsForDialog[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterData" )); aPropsForDialog[0].Value = css::uno::makeAny( aFilterDataValue ); - + //when executing the dialog will merge the persistent FilterData properties xFilterProperties->setPropertyValues( aPropsForDialog ); } - + if( xExporter.is() ) xExporter->setSourceDocument( uno::Reference< lang::XComponent >( xModel, uno::UNO_QUERY ) ); @@ -235,7 +235,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( { //get the filter data uno::Sequence< beans::PropertyValue > aPropsFromDialog = xFilterProperties->getPropertyValues(); - + //add them to the args for ( sal_Int32 nInd = 0; nInd < aPropsFromDialog.getLength(); nInd++ ) { @@ -251,7 +251,7 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( eRet = SAVE_SUCCESSFULL; } else - { + { // cancel from dialog, then do not send // If the model is not modified, it could be modified by the dispatch calls. // Therefore set back to modified = false. This should not hurt if we call @@ -280,26 +280,26 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( throw; } catch( uno::Exception& ) - { + { } return eRet; } sal_Int32 SfxMailModel::GetCount() const -{ +{ return maAttachedDocuments.size(); } sal_Bool SfxMailModel::IsEmpty() const -{ +{ return maAttachedDocuments.empty(); } -SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( +SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( const rtl::OUString& aSaveFileName, - const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, - const rtl::OUString& rType, + const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, + const rtl::OUString& rType, rtl::OUString& rFileNamePath ) { SaveResult eRet( SAVE_ERROR ); @@ -335,7 +335,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( xController.is() ) xModel = xController->getModel(); } - + // We need at least a valid module name and model reference if (( aModule.getLength() > 0 ) && xModel.is() ) { @@ -345,7 +345,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( css::uno::Reference< css::util::XModifiable > xModifiable( xModel, css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XStorable > xStorable( xModel, css::uno::UNO_QUERY ); - + if ( xModifiable.is() ) bModified = xModifiable->isModified(); if ( xStorable.is() ) @@ -367,12 +367,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( rtl::OUString aTypeName( rType ); rtl::OUString aFileName; rtl::OUString aExtension; - + css::uno::Reference< css::container::XContainerQuery > xContainerQuery( - xSMGR->createInstance( rtl::OUString( + xSMGR->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ))), css::uno::UNO_QUERY ); - + if ( bStoreTo ) { // Retrieve filter from type @@ -391,10 +391,10 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aQuery[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Flags" )); aQuery[2].Value = css::uno::makeAny( sal_Int32(0x80042) ); // EXPORT ALIEN 3RDPARTY } - - css::uno::Reference< css::container::XEnumeration > xEnumeration = + + css::uno::Reference< css::container::XEnumeration > xEnumeration = xContainerQuery->createSubSetEnumerationByProperties( aQuery ); - + if ( xEnumeration->hasMoreElements() ) { ::comphelper::SequenceAsHashMap aFilterPropsHM( xEnumeration->nextElement() ); @@ -402,7 +402,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( ::rtl::OUString::createFromAscii( "Name" ), ::rtl::OUString() ); } - + if ( bHasLocation ) { // Retrieve filter from media descriptor @@ -415,7 +415,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // We should save the document in the original format. Therefore this // is not a storeTo operation. To support signing in this case, reset // bStoreTo flag. - bStoreTo = false; + bStoreTo = false; } } } @@ -440,7 +440,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aFilterName = aFilterPropsHM.getUnpackedValueOrDefault( ::rtl::OUString::createFromAscii( "ooSetupFactoryDefaultFilter" ), ::rtl::OUString() ); - css::uno::Reference< css::container::XNameAccess > xNameAccess2( + css::uno::Reference< css::container::XNameAccess > xNameAccess2( xContainerQuery, css::uno::UNO_QUERY ); if ( xNameAccess2.is() ) { @@ -461,7 +461,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // No filter found => error // No type and no location => error - if (( aFilterName.getLength() == 0 ) || + if (( aFilterName.getLength() == 0 ) || (( aTypeName.getLength() == 0 ) && !bHasLocation )) return eRet; @@ -474,10 +474,10 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( else { css::uno::Reference< container::XNameAccess > xTypeDetection( - xSMGR->createInstance( ::rtl::OUString( + xSMGR->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ))), css::uno::UNO_QUERY ); - + if ( xTypeDetection.is() ) { @@ -495,7 +495,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( } } } - + // Use provided save file name. If empty determine file name aFileName = aSaveFileName; if ( aFileName.getLength() == 0 ) @@ -513,14 +513,14 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aFileName = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::NO_DECODE ); } } - + // No file name => error if ( aFileName.getLength() == 0 ) return eRet; - + OSL_ASSERT( aFilterName.getLength() > 0 ); OSL_ASSERT( aFileName.getLength() > 0 ); - + // Creates a temporary directory to store a predefined file into it. // This makes it possible to store the file for "send document as e-mail" // with the original file name. We cannot use the original file as @@ -532,7 +532,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aFilePathObj.setExtension( aExtension ); rtl::OUString aFileURL = aFilePathObj.GetMainURL( INetURLObject::NO_DECODE ); - + sal_Int32 nNumArgs(0); const rtl::OUString aPasswordPropName( RTL_CONSTASCII_USTRINGPARAM( "Password" )); css::uno::Sequence< css::beans::PropertyValue > aArgs( ++nNumArgs ); @@ -561,7 +561,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( css::uno::Reference< css::frame::XDispatchProvider > xDispatchProvider( xFrame, css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XDispatch > xDispatch; - + css::util::URL aURL; css::uno::Sequence< css::beans::PropertyValue > aDispatchArgs; @@ -575,7 +575,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( if ( xDispatchProvider.is() ) { - xDispatch = css::uno::Reference< css::frame::XDispatch >( + xDispatch = css::uno::Reference< css::frame::XDispatch >( xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 )); if ( xDispatch.is() ) { @@ -597,14 +597,14 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( //check if this is the pdf otput filter (i#64555) if( bSendAsPDF ) { - SaveResult eShowPDFFilterDialog = ShowFilterOptionsDialog( + SaveResult eShowPDFFilterDialog = ShowFilterOptionsDialog( xSMGR, xModel, aFilterName, rType, bModified, nNumArgs, aArgs ); - + // don't continue on dialog cancel or error if ( eShowPDFFilterDialog != SAVE_SUCCESSFULL ) return eShowPDFFilterDialog; } - + xStorable->storeToURL( aFileURL, aArgs ); rFileNamePath = aFileURL; eRet = SAVE_SUCCESSFULL; @@ -617,10 +617,10 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( aURL.Complete = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MailExportFinished" )); xURLTransformer->parseStrict( aURL ); } - + if ( xDispatchProvider.is() ) { - xDispatch = css::uno::Reference< css::frame::XDispatch >( + xDispatch = css::uno::Reference< css::frame::XDispatch >( xDispatchProvider->queryDispatch( aURL, ::rtl::OUString(), 0 )); if ( xDispatch.is() ) { @@ -637,7 +637,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( } } } - } + } // If the model is not modified, it could be modified by the dispatch calls. // Therefore set back to modified = false. This should not hurt if we call // on a non-modified model. @@ -741,9 +741,9 @@ void SfxMailModel::AddAddress( const String& rAddress, AddressRole eRole ) } } -SfxMailModel::SendMailResult SfxMailModel::AttachDocument( - const ::rtl::OUString& sDocumentType, - const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, +SfxMailModel::SendMailResult SfxMailModel::AttachDocument( + const ::rtl::OUString& sDocumentType, + const css::uno::Reference< css::uno::XInterface >& xFrameOrModel, const ::rtl::OUString& sAttachmentTitle ) { rtl::OUString sFileName; @@ -752,7 +752,7 @@ SfxMailModel::SendMailResult SfxMailModel::AttachDocument( if ( eSaveResult == SAVE_SUCCESSFULL && ( sFileName.getLength() > 0 ) ) maAttachedDocuments.push_back(sFileName); return eSaveResult == SAVE_SUCCESSFULL ? SEND_MAIL_OK : SEND_MAIL_ERROR; -} +} SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css::frame::XFrame >& xFrame ) { @@ -850,7 +850,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: } Sequence< OUString > aAttachmentSeq(&(maAttachedDocuments[0]),maAttachedDocuments.size()); - + xSimpleMailMessage->setSubject( maSubject ); xSimpleMailMessage->setAttachement( aAttachmentSeq ); @@ -873,7 +873,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: ::vos::OGuard aGuard( Application::GetSolarMutex() ); Window* pParentWindow = VCLUnoHelper::GetWindow( xParentWindow ); - + ErrorBox aBox( pParentWindow, SfxResId( RID_ERRBOX_MAIL_CONFIG )); aBox.Execute(); eResult = SEND_MAIL_CANCELLED; @@ -946,7 +946,7 @@ BOOL CreateFromAddress_Impl( String& rFrom ) rFrom.EraseAllChars( '@' ); } String aEmailName = aUserCFG.GetEmail(); - + // unerlaubte Zeichen entfernen aEmailName.EraseAllChars( '<' ); aEmailName.EraseAllChars( '>' ); diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index d2158c3dad..c44765deea 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ #include #include #include -#include +#include #include #include #include @@ -284,7 +284,7 @@ namespace String aLeadingStr; if ( xStor.is() ) { - sal_Bool bHasName = xStor->hasLocation(); + sal_Bool bHasName = xStor->hasLocation(); if ( !bHasName ) { @@ -342,12 +342,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt // detect filter const SfxFilter* pFilter = SfxFilter::GetDefaultFilter(lcl_getFactoryName(_xModel)); // sal_Bool bHasFilter = pFilter != NULL; - + sal_Bool bRet = sal_False; // create temp file name with leading chars and extension Reference < XStorable > xStor( _xModel, UNO_QUERY ); if ( xStor.is() ) - { + { String* pExt = NULL; INetURLObject aFileObj(_xModel->getURL()); if ( aFileObj.hasExtension() ) @@ -363,12 +363,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt } { - ::utl::TempFile aTempFile( aLeadingStr, pExt ); + ::utl::TempFile aTempFile( aLeadingStr, pExt ); rFileName = aTempFile.GetURL(); } delete pExt; // save document to temp file - + // save document to temp file Sequence < PropertyValue > aArgs( _xModel->getArgs() ); ::comphelper::MediaDescriptor aMedia(aArgs); @@ -392,8 +392,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt ::rtl::OUString sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); if ( !aMedia.createItemIfMissing(sReadOnly,sal_False) ) aMedia[sReadOnly] <<= sal_False; - - aMedia >> aArgs; + + aMedia >> aArgs; try { @@ -407,7 +407,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt { } } - + // restore old settings /* TODO if ( !bModified && xDocShell->IsEnableSetModified() ) @@ -460,7 +460,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAt // save document to temp file Sequence < PropertyValue > aArgs( _xModel->getArgs() ); ::comphelper::MediaDescriptor aMedia(aArgs); - + ::rtl::OUString sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); if ( !aMedia.createItemIfMissing(sMediaType,sPDFMediaType) ) aMedia[sMediaType] <<= sPDFMediaType; @@ -468,7 +468,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAt ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL")); if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) ) aMedia[sURL] <<= ::rtl::OUString(rFileName); - aMedia >> aArgs; + aMedia >> aArgs; try { @@ -596,7 +596,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( ) SendMailResult eResult = SEND_MAIL_ERROR; if ( !maAttachedDocuments.empty() ) { - + Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory(); if ( xMgr.is() ) { @@ -606,7 +606,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( ) xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >( xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleSystemMail" ))), UNO_QUERY ); - + if ( ! xSimpleMailClientSupplier.is() ) { xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >( diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index fbfc43bc90..49fc373fda 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -34,7 +34,7 @@ #ifndef GCC #endif #include -#include +#include #include #include diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index e35859a946..0dac077921 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #ifndef _WRKWIN_HXX //autogen #include #endif -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 4a97f85a9d..1abd1ffa36 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include "srchdlg.hrc" #include "dialog.hrc" #include -#include +#include using namespace ::com::sun::star::uno; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6e52807a5c..6ddc4bb7d2 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #define _SVSTDARR_USHORTS #include diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 64e7fcda94..f6e5602e44 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx index a1354d2b0f..8a98a1f8bd 100644 --- a/sfx2/source/doc/applet.cxx +++ b/sfx2/source/doc/applet.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -189,9 +189,9 @@ void SAL_CALL AppletObject::initialize( const uno::Sequence< uno::Any >& aArgume aArguments[0] >>= mxObj; } -sal_Bool SAL_CALL AppletObject::load( +sal_Bool SAL_CALL AppletObject::load( const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, - const uno::Reference < frame::XFrame >& xFrame ) + const uno::Reference < frame::XFrame >& xFrame ) throw( uno::RuntimeException ) { if ( SvtJavaOptions().IsExecuteApplets() && SvtMiscOptions().IsPluginsEnabled() ) @@ -278,7 +278,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL AppletObject::getPropertySetI void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - + const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); if( !pEntry ) throw beans::UnknownPropertyException(); @@ -314,7 +314,7 @@ void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyNam aAny >>= maName; break; default:; - + } } @@ -348,7 +348,7 @@ uno::Any SAL_CALL AppletObject::getPropertyValue(const ::rtl::OUString& aPropert aAny <<= maName; break; default:; - + } return aAny; } diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 1c1ac4ea27..b1c48a83e5 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index f44ac7c3ec..d6a57d4129 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,7 +121,7 @@ using namespace ::com::sun::star::io; #include #include #include -#include +#include #include #include #include @@ -133,7 +133,7 @@ using namespace ::com::sun::star::io; #include #include #include -#include +#include #include #include "opostponedtruncationstream.hxx" @@ -217,7 +217,7 @@ sal_Bool IsOOoLockFileUsed() } } // anonymous namespace -//========================================================== +//========================================================== //---------------------------------------------------------------- @@ -575,7 +575,7 @@ void SfxMedium::CheckFileDate( const util::DateTime& aInitDate ) } catch ( uno::Exception& ) {} - } + } } } @@ -1006,7 +1006,7 @@ sal_Int8 SfxMedium::ShowLockedDocumentDialog( const uno::Sequence< ::rtl::OUStri ::rtl::OUString aDocumentURL = GetURLObject().GetLastName(); ::rtl::OUString aInfo; ::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl; - + if ( bOwnLock ) { if ( aData.getLength() > LOCKFILE_EDITTIME_ID ) @@ -1121,7 +1121,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) if ( !bResult && !IsReadOnly() ) { // check whether the file is readonly in fs - // the check is only necessary if + // the check is only necessary if // do it only for loading, some contents still might have problems with this property, let them not affect the saving sal_Bool bContentReadonly = sal_False; if ( bLoading && ::utl::LocalFileHelper::IsLocalFile( aLogicName ) ) @@ -1173,7 +1173,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) do { try - { + { ::svt::DocumentLockFile aLockFile( aLogicName ); if ( !bHandleSysLocked ) { @@ -1195,7 +1195,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) { // system file locking is not active, ask user whether he wants to open the document without any locking uno::Reference< task::XInteractionHandler > xHandler = GetInteractionHandler(); - + if ( xHandler.is() ) { ::rtl::Reference< ::ucbhelper::InteractionRequest > xIgnoreRequestImpl @@ -1235,7 +1235,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) } } - + if ( !bResult ) { uno::Sequence< ::rtl::OUString > aData; @@ -1254,7 +1254,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) bOwnLock = ( aData.getLength() > LOCKFILE_USERURL_ID && aOwnData.getLength() > LOCKFILE_USERURL_ID && aOwnData[LOCKFILE_SYSUSERNAME_ID].equals( aData[LOCKFILE_SYSUSERNAME_ID] ) ); - + if ( bOwnLock && aOwnData[LOCKFILE_LOCALHOST_ID].equals( aData[LOCKFILE_LOCALHOST_ID] ) && aOwnData[LOCKFILE_USERURL_ID].equals( aData[LOCKFILE_USERURL_ID] ) ) @@ -1300,7 +1300,7 @@ sal_Bool SfxMedium::LockOrigFileOnDemand( sal_Bool bLoading, sal_Bool bNoUI ) SFX_ITEMSET_ARG( pSet, pReadOnlyItem, SfxBoolItem, SID_DOC_READONLY, FALSE ); if ( !bLoading || (pReadOnlyItem && !pReadOnlyItem->GetValue()) ) SetError( ERRCODE_IO_ACCESSDENIED, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); - else + else GetItemSet()->Put( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); } @@ -2689,7 +2689,7 @@ void SfxMedium::CloseAndRelease() void SfxMedium::UnlockFile() { if ( pImp->m_bLocked ) - { + { try { pImp->m_bLocked = sal_False; @@ -3151,7 +3151,7 @@ void SfxMedium::SetStorage_Impl( const uno::Reference < embed::XStorage >& rStor SfxItemSet* SfxMedium::GetItemSet() const { // this method *must* return an ItemSet, returning NULL can cause crashes - if( !pSet ) + if( !pSet ) ((SfxMedium*)this)->pSet = new SfxAllItemSet( SFX_APP()->GetPool() ); return pSet; } @@ -3566,7 +3566,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: ::com::sun::star::uno::Reference< ::com::sun::star::security::XDocumentDigitalSignatures > xSigner( comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.security.DocumentDigitalSignatures" ) ), - aArgs ), + aArgs ), ::com::sun::star::uno::UNO_QUERY ); if ( xSigner.is() ) @@ -3597,7 +3597,7 @@ sal_Bool SfxMedium::SignContents_Impl( sal_Bool bScriptingContent, const ::rtl:: { // If the signature has already the document signature it will be removed // after the scripting signature is inserted. - uno::Reference< io::XStream > xStream( + uno::Reference< io::XStream > xStream( xMetaInf->openStreamElement( xSigner->getScriptingContentSignatureDefaultStreamName(), embed::ElementModes::READWRITE ), uno::UNO_SET_THROW ); @@ -3829,7 +3829,7 @@ sal_Bool SfxMedium::CallApproveHandler( const uno::Reference< task::XInteraction { uno::Reference< embed::XStorage > xStorage = GetStorage(); uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY ); - + if ( xOptStorage.is() ) { // TODO/LATER: reuse the pImp->pTempFile if it already exists @@ -3894,7 +3894,7 @@ sal_Bool SfxMedium::SwitchDocumentToFile( ::rtl::OUString aURL ) { uno::Reference< embed::XStorage > xStorage = GetStorage(); uno::Reference< embed::XOptimizedStorage > xOptStorage( xStorage, uno::UNO_QUERY ); - + if ( xOptStorage.is() ) { // TODO/LATER: reuse the pImp->pTempFile if it already exists @@ -3935,7 +3935,7 @@ sal_Bool SfxMedium::SwitchDocumentToFile( ::rtl::OUString aURL ) } } } - + return bResult; } diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index a2e2963479..8d96c08a51 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index d0ee1aacc8..e7dc765911 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index cef00ca6e7..c8f7704061 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 830b27d900..ea0eced3d2 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,8 +53,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index e55654043b..6d0a885747 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -62,12 +62,12 @@ #include "guisaveas.hxx" -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -812,7 +812,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, eCtxt = sfx2::FileDialogHelper::SI_EXPORT; if( aDocServiceName.equalsAscii( "com.sun.star.text.TextDocument" ) ) eCtxt = sfx2::FileDialogHelper::SW_EXPORT; - + if ( eCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT ) pFileDlg->SetContext( eCtxt ); @@ -826,7 +826,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, { ::rtl::OUString aCtrlText = String( SfxResId( STR_EXPORTBUTTON ) ); xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::PUSHBUTTON_OK, aCtrlText ); - + aCtrlText = ::rtl::OUString( String( SfxResId( STR_LABEL_FILEFORMAT ) ) ); xControlAccess->setLabel( ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER_LABEL, aCtrlText ); } @@ -1090,7 +1090,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() ::rtl::OUString aConfigSuggestion( ( aCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT ) ? SvtPathOptions().GetGraphicPath() : SvtPathOptions().GetWorkPath() ); aReccomendedDir = INetURLObject( aConfigSuggestion ).GetMainURL( INetURLObject::NO_DECODE ); } - + return aReccomendedDir; } @@ -1316,7 +1316,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( const uno::Reference< frame::XModel >& // if it is no export, warn user that the signature will be removed if ( SIGNATURESTATE_SIGNATURES_OK == nDocumentSignatureState || SIGNATURESTATE_SIGNATURES_INVALID == nDocumentSignatureState - || SIGNATURESTATE_SIGNATURES_NOTVALIDATED == nDocumentSignatureState + || SIGNATURESTATE_SIGNATURES_NOTVALIDATED == nDocumentSignatureState || SIGNATURESTATE_SIGNATURES_PARTIAL_OK == nDocumentSignatureState) { if ( QueryBox( NULL, SfxResId( RID_XMLSEC_QUERY_LOSINGSIGNATURE ) ).Execute() != RET_YES ) diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 8398679302..c2c4ee717f 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -52,14 +52,14 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index ff4ed98058..d6cce3c0fe 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include #include @@ -111,7 +111,7 @@ using namespace ::com::sun::star::container; #include #include -#include +#include #include #include #include @@ -2535,7 +2535,7 @@ void SfxObjectShell::StoreLog() ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}" ) ); ::rtl::Bootstrap::expandMacros( aFileURL ); - ::rtl::OUString aBuildID = + ::rtl::OUString aBuildID = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/setup.ini:buildid}" ) ); ::rtl::Bootstrap::expandMacros( aBuildID ); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8cf35d3533..f9c5148754 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -64,10 +64,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -1392,10 +1392,10 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) } catch( uno::Exception& ) {} - + bool bNoSig = false; - if ( IsModified() || !GetMedium() || !GetMedium()->GetName().Len() + if ( IsModified() || !GetMedium() || !GetMedium()->GetName().Len() || (!aODFVersion.equals( ODFVER_012_TEXT ) && !bHasSign) ) { // the document might need saving ( new, modified or in ODF1.1 format without signature ) @@ -1434,10 +1434,10 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) } else { - ErrorBox( NULL, WB_OK, SfxResId( STR_XMLSEC_ODF12_EXPECTED ) ).Execute(); + ErrorBox( NULL, WB_OK, SfxResId( STR_XMLSEC_ODF12_EXPECTED ) ).Execute(); return; } - + if ( IsModified() || !GetMedium() || !GetMedium()->GetName().Len() ) return; } @@ -1459,7 +1459,7 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) // We sign only ODF1.2, that means that if this point has been reached, // the ODF1.2 signing process should be used. // This code still might be called to show the signature of ODF1.1 document. - sal_Bool bSigned = GetMedium()->SignContents_Impl( + sal_Bool bSigned = GetMedium()->SignContents_Impl( bScriptingContent, aODFVersion, pImp->nDocumentSignatureState == SIGNATURESTATE_SIGNATURES_OK @@ -1481,7 +1481,7 @@ void SfxObjectShell::ImplSign( sal_Bool bScriptingContent ) pImp->nDocumentSignatureState = SIGNATURESTATE_UNKNOWN;// Re-Check pImp->bSignatureErrorIsShown = sal_False; - + Invalidate( SID_SIGNATURE ); Invalidate( SID_MACRO_SIGNATURE ); Broadcast( SfxSimpleHint(SFX_HINT_TITLECHANGED) ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 6ab2bf2d81..23ada65f9a 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -80,16 +80,15 @@ #include #include #include -#include +#include #include #include #include -#include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -670,7 +669,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { // the macros in repaired documents should be disabled pMedium->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, document::MacroExecMode::NEVER_EXECUTE ) ); - + // the mediatype was retrieved by using fallback solution but this is a repairing mode // so it is acceptable to open the document if there is no contents that required manifest.xml bWarnMediaTypeFallback = sal_False; @@ -1698,7 +1697,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl catch( uno::Exception& ) { } - + pMedium->Close(); rMedium.CloseZipStorage_Impl(); } @@ -1795,7 +1794,7 @@ sal_Bool SfxObjectShell::SaveTo_Impl #ifdef OS2 { -#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer +#define CHAR_POINTER(THE_OUSTRING) ::rtl::OUStringToOString (THE_OUSTRING, RTL_TEXTENCODING_UTF8).pData->buffer // Header for a single-valued ASCII EA data item typedef struct _EA_ASCII_header { USHORT usAttr; /* value: EAT_ASCII */ diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index d7470e9d8b..596aedef70 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include @@ -71,7 +71,7 @@ #endif #include #include -#include +#include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include #endif @@ -83,7 +83,7 @@ #include #include -#include +#include #include #include #include @@ -584,7 +584,7 @@ sal_uInt16 SfxObjectShell::PrepareClose SfxApplication *pSfxApp = SFX_APP(); pSfxApp->NotifyEvent( SfxEventHint(SFX_EVENT_PREPARECLOSEDOC, GlobalEventConfig::GetEventName(STR_EVENT_PREPARECLOSEDOC), this) ); - + if( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) { pImp->bPreparedForClose = sal_True; diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index f1a10d7b5f..1593ed3a58 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #include #include #include -#include +#include //-------------------------------------------------------------------------------------------------------- @@ -143,10 +143,10 @@ struct ModelCollectionMutexBase typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > > TModelList; //============================================================================= -class ModelCollectionEnumeration : public ModelCollectionMutexBase +class ModelCollectionEnumeration : public ModelCollectionMutexBase , public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration > { - + //------------------------------------------------------------------------- // member //------------------------------------------------------------------------- @@ -154,7 +154,7 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xSMGR; TModelList m_lModels; TModelList::iterator m_pEnumerationIt; - + //------------------------------------------------------------------------- // native interface //------------------------------------------------------------------------- @@ -162,16 +162,16 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase ModelCollectionEnumeration(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSMGR); virtual ~ModelCollectionEnumeration(); void setModelList(const TModelList& rList); - + //------------------------------------------------------------------------- - // uno interface + // uno interface //------------------------------------------------------------------------- public: - + // css.container.XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() throw(::com::sun::star::uno::RuntimeException); - + virtual ::com::sun::star::uno::Any SAL_CALL nextElement() throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException , @@ -179,7 +179,7 @@ class ModelCollectionEnumeration : public ModelCollectionMutexBase }; //============================================================================= -class SfxGlobalEvents_Impl : public ModelCollectionMutexBase +class SfxGlobalEvents_Impl : public ModelCollectionMutexBase , public ::cppu::WeakImplHelper7< ::com::sun::star::lang::XServiceInfo , ::com::sun::star::document::XEventsSupplier , ::com::sun::star::document::XEventBroadcaster @@ -193,22 +193,22 @@ class SfxGlobalEvents_Impl : public ModelCollectionMutexBase ::com::sun::star::uno::WeakReference< ::com::sun::star::document::XEventListener > m_xJobExecutorListener; OINTERFACECONTAINERHELPER m_aLegacyListeners; OINTERFACECONTAINERHELPER m_aDocumentListeners; - TModelList m_lModels; + TModelList m_lModels; GlobalEventConfig* pImp; public: SfxGlobalEvents_Impl(const com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xSMGR); virtual ~SfxGlobalEvents_Impl(); - + SFX_DECL_XSERVICEINFO - + // css.document.XEventBroadcaster virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > SAL_CALL getEvents() throw(::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& xListener) throw(::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& xListener) throw(::com::sun::star::uno::RuntimeException); @@ -216,23 +216,23 @@ public: virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - + // css.document.XEventListener virtual void SAL_CALL notifyEvent(const ::com::sun::star::document::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); // css.document.XDocumentEventListener virtual void SAL_CALL documentEventOccured( const ::com::sun::star::document::DocumentEvent& Event ) throw (::com::sun::star::uno::RuntimeException); - + // css.container.XSet virtual sal_Bool SAL_CALL has(const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::uno::RuntimeException); - + virtual void SAL_CALL insert(const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException , ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException ); - + virtual void SAL_CALL remove(const ::com::sun::star::uno::Any& aElement) throw(::com::sun::star::lang::IllegalArgumentException , ::com::sun::star::container::NoSuchElementException, @@ -241,25 +241,25 @@ public: // css.container.XEnumerationAccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException); - + // css.container.XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException); - + // css.lang.XEventListener virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException); - + private: // threadsafe void implts_notifyJobExecution(const ::com::sun::star::document::EventObject& aEvent); void implts_checkAndExecuteEventBindings(const ::com::sun::star::document::DocumentEvent& aEvent); void implts_notifyListener(const ::com::sun::star::document::DocumentEvent& aEvent); - + // not threadsafe TModelList::iterator impl_searchDoc(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel); }; diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 8ee3b79a6f..07421d0934 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include "sfx2/docmacromode.hxx" #include "bitset.hxx" @@ -180,7 +180,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess virtual ~SfxObjectShell_Impl(); static sal_Bool NeedsOfficeUpdateDialog(); - + // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ); diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index 895b1e7523..beae0e9a1a 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index bf7c521ade..0478fb0ea9 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include #include #include -#include +#include #define _SVSTDARR_USHORTS #include diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 4530277451..4200054df0 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 933581c7fd..ae1453f3fd 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,9 @@ #include #include #include -#include +#include -#include +#include #include #include "eventsupplier.hxx" @@ -339,7 +339,7 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const DOCEVENTOBJECT& aEvent ) throw( aGuard.clear(); Execute( aEventData, css::document::DocumentEvent(aEvent.Source, aEvent.EventName, NULL, css::uno::Any()), mpObjShell ); } - + //-------------------------------------------------------------------------------------------------------- // --- ::lang::XEventListener --- //-------------------------------------------------------------------------------------------------------- @@ -593,7 +593,7 @@ sal_Bool SAL_CALL ModelCollectionEnumeration::hasMoreElements() return (m_pEnumerationIt != m_lModels.end()); // <- SAFE } - + css::uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() throw(css::container::NoSuchElementException, css::lang::WrappedTargetException , @@ -609,10 +609,10 @@ css::uno::Any SAL_CALL ModelCollectionEnumeration::nextElement() ++m_pEnumerationIt; aLock.clear(); // <- SAFE - + return css::uno::makeAny(xModel); } - + SFX_IMPL_XSERVICEINFO( SfxGlobalEvents_Impl, "com.sun.star.frame.GlobalEventBroadcaster", "com.sun.star.comp.sfx2.GlobalEventBroadcaster" ) SFX_IMPL_ONEINSTANCEFACTORY( SfxGlobalEvents_Impl ); @@ -650,7 +650,7 @@ css::uno::Reference< css::container::XNameReplace > SAL_CALL SfxGlobalEvents_Imp } //----------------------------------------------------------------------------- -void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const css::uno::Reference< css::document::XEventListener >& xListener) +void SAL_CALL SfxGlobalEvents_Impl::addEventListener(const css::uno::Reference< css::document::XEventListener >& xListener) throw(css::uno::RuntimeException) { // container is threadsafe @@ -694,7 +694,7 @@ void SAL_CALL SfxGlobalEvents_Impl::notifyEvent(const css::document::EventObject { css::document::DocumentEvent aDocEvent(aEvent.Source, aEvent.EventName, NULL, css::uno::Any()); implts_notifyJobExecution(aEvent); - implts_checkAndExecuteEventBindings(aDocEvent); + implts_checkAndExecuteEventBindings(aDocEvent); implts_notifyListener(aDocEvent); } @@ -712,7 +712,7 @@ void SAL_CALL SfxGlobalEvents_Impl::disposing(const css::lang::EventObject& aEve throw(css::uno::RuntimeException) { css::uno::Reference< css::frame::XModel > xDoc(aEvent.Source, UNO_QUERY); - + // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); TModelList::iterator pIt = impl_searchDoc(xDoc); @@ -728,9 +728,9 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const css::uno::Any& aElement) { css::uno::Reference< css::frame::XModel > xDoc; aElement >>= xDoc; - + sal_Bool bHas = sal_False; - + // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); TModelList::iterator pIt = impl_searchDoc(xDoc); @@ -738,8 +738,8 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const css::uno::Any& aElement) bHas = sal_True; aLock.clear(); // <- SAFE - - return bHas; + + return bHas; } //----------------------------------------------------------------------------- @@ -755,7 +755,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const css::uno::Any& aElement ) ::rtl::OUString::createFromAscii("Cant locate at least the model parameter."), static_cast< css::container::XSet* >(this), 0); - + // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); TModelList::iterator pIt = impl_searchDoc(xDoc); @@ -792,7 +792,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const css::uno::Any& aElement ) ::rtl::OUString::createFromAscii("Cant locate at least the model parameter."), static_cast< css::container::XSet* >(this), 0); - + // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); TModelList::iterator pIt = impl_searchDoc(xDoc); @@ -800,10 +800,10 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const css::uno::Any& aElement ) throw css::container::NoSuchElementException( ::rtl::OUString(), static_cast< css::container::XSet* >(this)); - m_lModels.erase(pIt); + m_lModels.erase(pIt); aLock.clear(); // <- SAFE - + css::uno::Reference< css::document::XDocumentEventBroadcaster > xDocBroadcaster(xDoc, UNO_QUERY ); if (xDocBroadcaster.is()) xDocBroadcaster->removeDocumentEventListener(this); @@ -829,7 +829,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL SfxGlobalEvents_Imp UNO_QUERY); aLock.clear(); // <- SAFE - + return xEnum; } @@ -879,7 +879,7 @@ void SfxGlobalEvents_Impl::implts_checkAndExecuteEventBindings(const css::docume css::uno::Reference< css::container::XNameReplace > xEvents = m_xEvents; aLock.clear(); // <- SAFE - + css::uno::Any aAny; if (xEvents.is()) aAny = xEvents->getByName(aEvent.EventName); @@ -907,7 +907,7 @@ TModelList::iterator SfxGlobalEvents_Impl::impl_searchDoc(const css::uno::Refere { if (!xModel.is()) return m_lModels.end(); - + TModelList::iterator pIt; for ( pIt = m_lModels.begin(); pIt != m_lModels.end() ; @@ -917,7 +917,7 @@ TModelList::iterator SfxGlobalEvents_Impl::impl_searchDoc(const css::uno::Refere if (xContainerDoc == xModel) break; } - + return pIt; } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f0efa2da90..905004bcd8 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #include @@ -490,7 +490,7 @@ void SfxToolBoxControl::Dispatch( const ::rtl::OUString& aCommand, ::com::sun::s ::rtl::OUString sAppName; try { - static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"); + static ::rtl::OUString our_aModuleManagerName = ::rtl::OUString::createFromAscii("com.sun.star.frame.ModuleManager"); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceManager = ::comphelper::getProcessServiceFactory(); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModuleManager > xModuleManager( diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index cab7101731..fa0a6fe75d 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ #include #include #include -#include +#include #ifndef css namespace css = ::com::sun::star; diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx index ec782c1750..e8007b6792 100644 --- a/sfx2/source/view/printer.cxx +++ b/sfx2/source/view/printer.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index 899b082c89..ba397cb672 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include #include -#include +#include #include #ifndef GCC diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index dd288efccf..0ed183c6fc 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include @@ -549,7 +549,7 @@ SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHi /* AS_TITLE pWindow->SetText( aTitle ); */ - + /* AS_ICON if( pWindow->GetType() == WINDOW_WORKWINDOW ) { diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 8f406833a5..3b6f43f358 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ #ifndef _SPLITWIN_HXX //autogen #include #endif -#include +#include #include #include #include @@ -665,7 +665,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) pNewSet->Put( *pURLItem ); // Filter Detection - SfxMedium aMedium( pURLItem->GetValue(), SFX_STREAM_READWRITE ); + SfxMedium aMedium( pURLItem->GetValue(), SFX_STREAM_READWRITE ); SfxFilterMatcher().GuessFilter( aMedium, &pFilter ); if ( pFilter ) pNewSet->Put( SfxStringItem( SID_FILTER_NAME, pFilter->GetName() ) ); @@ -3471,8 +3471,8 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq ) { try { - xLMPropSet->setPropertyValue( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HideCurrentUI" )), + xLMPropSet->setPropertyValue( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HideCurrentUI" )), makeAny( bNewFullScreenMode )); } catch ( ::com::sun::star::beans::UnknownPropertyException& ) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 0f1ae3d110..8da29780c7 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -785,7 +785,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) ExecPrint_Impl( rReq ); return; } - + pPrinter->SetNextJobIsQuick(); } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 7d41d2bfa0..43564e1488 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,12 +55,12 @@ #include #include #include -#include +#include #include #include -#include +#include -#include +#include #include #include #include @@ -177,8 +177,8 @@ void SAL_CALL SfxClipboardChangeListener::changedContents( const datatransfer::c } -static ::rtl::OUString RetrieveLabelFromCommand( - const ::rtl::OUString& rCommandURL, +static ::rtl::OUString RetrieveLabelFromCommand( + const ::rtl::OUString& rCommandURL, const css::uno::Reference< css::frame::XFrame >& rFrame ) { static css::uno::WeakReference< frame::XModuleManager > s_xModuleManager; @@ -187,38 +187,38 @@ static ::rtl::OUString RetrieveLabelFromCommand( ::rtl::OUString aLabel; css::uno::Reference< css::frame::XModuleManager > xModuleManager( s_xModuleManager ); css::uno::Reference< css::container::XNameAccess > xNameAccess( s_xNameAccess ); - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR( + css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR( ::comphelper::getProcessServiceFactory(), css::uno::UNO_QUERY_THROW); - + try { if ( !xModuleManager.is() ) { - xModuleManager = css::uno::Reference< css::frame::XModuleManager >( - xSMGR->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))), + xModuleManager = css::uno::Reference< css::frame::XModuleManager >( + xSMGR->createInstance( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ModuleManager" ))), css::uno::UNO_QUERY_THROW ); s_xModuleManager = xModuleManager; } - + ::rtl::OUString aModuleIdentifier = xModuleManager->identify( rFrame ); - + if ( !xNameAccess.is() ) { - xNameAccess = css::uno::Reference< css::container::XNameAccess >( - xSMGR->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ))), + xNameAccess = css::uno::Reference< css::container::XNameAccess >( + xSMGR->createInstance( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.UICommandDescription" ))), css::uno::UNO_QUERY_THROW ); s_xNameAccess = xNameAccess; } - + css::uno::Any a = xNameAccess->getByName( aModuleIdentifier ); css::uno::Reference< css::container::XNameAccess > xUICommands; a >>= xUICommands; rtl::OUString aStr; css::uno::Sequence< css::beans::PropertyValue > aPropSeq; - + a = xUICommands->getByName( rCommandURL ); if ( a >>= aPropSeq ) { @@ -236,7 +236,7 @@ static ::rtl::OUString RetrieveLabelFromCommand( catch ( css::uno::Exception& ) { } - + return aLabel; } @@ -428,9 +428,9 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) if( pItemWin ) pItemWin->GrabFocus(); break; - } + } } - } + } } } } @@ -440,7 +440,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) } rReq.Done(); } - break; + break; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - case SID_MAIL_SENDDOCASMS: @@ -759,7 +759,7 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) if ( bEnabled ) { SfxPrinter *pPrinter = GetPrinter(FALSE); - + if ( SID_PRINTDOCDIRECT == nSID ) { rtl::OUString aPrinterName; @@ -770,15 +770,15 @@ void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) if ( aPrinterName.getLength() > 0 ) { uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame()->GetFrameInterface() ); - + ::rtl::OUStringBuffer aBuffer( 60 ); - aBuffer.append( RetrieveLabelFromCommand( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrintDefault" )), + aBuffer.append( RetrieveLabelFromCommand( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:PrintDefault" )), xFrame )); aBuffer.appendAscii( " (" ); aBuffer.append( aPrinterName ); aBuffer.appendAscii( ")" ); - + rSet.Put( SfxStringItem( SID_PRINTDOCDIRECT, aBuffer.makeStringAndClear() ) ); } } diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 8e9bc4d179..d118cfbb40 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -756,23 +756,23 @@ #include "svtools/adrparse.hxx" #include "svtools/apearcfg.hxx" #include "svtools/brdcst.hxx" -#include "svtools/cacheoptions.hxx" +#include "unotools/cacheoptions.hxx" #include "svtools/cancel.hxx" #include "svtools/cjkoptions.hxx" -#include "svtools/cmdoptions.hxx" +#include "unotools/cmdoptions.hxx" #include "svtools/cntwall.hxx" #include "svtools/colorcfg.hxx" #include "svtools/ctloptions.hxx" -#include "svtools/defaultoptions.hxx" -#include "svtools/dynamicmenuoptions.hxx" +#include "unotools/defaultoptions.hxx" +#include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" #include "svtools/eitem.hxx" -#include "svtools/eventcfg.hxx" -#include "svtools/extendedsecurityoptions.hxx" +#include "unotools/eventcfg.hxx" +#include "unotools/extendedsecurityoptions.hxx" #include "svtools/filenotation.hxx" #include "svtools/flagitem.hxx" -#include "svtools/fltrcfg.hxx" -#include "svtools/fontoptions.hxx" +#include "unotools/fltrcfg.hxx" +#include "unotools/fontoptions.hxx" #include "svtools/fontsubstconfig.hxx" #include "svtools/helpopt.hxx" #include "svtools/hint.hxx" @@ -784,17 +784,17 @@ #include "svtools/imappoly.hxx" #include "svtools/imaprect.hxx" #include "svtools/inetimg.hxx" -#include "svtools/inetoptions.hxx" +#include "unotools/inetoptions.hxx" #include "svtools/intitem.hxx" #include "svtools/isethint.hxx" #include "svtools/itemiter.hxx" #include "svtools/itempool.hxx" #include "svtools/itemprop.hxx" #include "svtools/itemset.hxx" -#include "svtools/javaoptions.hxx" +#include "unotools/javaoptions.hxx" #include "svtools/languageoptions.hxx" -#include "svtools/lingucfg.hxx" -#include "svtools/linguprops.hxx" +#include "unotools/lingucfg.hxx" +#include "unotools/linguprops.hxx" #include "svtools/lngmisc.hxx" #include "svtools/localresaccess.hxx" #include "svtools/lstner.hxx" @@ -803,30 +803,30 @@ #include "svtools/metitem.hxx" #include "svtools/misccfg.hxx" #include "svtools/miscopt.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/numuno.hxx" -#include "svtools/optionsdlg.hxx" +#include "unotools/optionsdlg.hxx" #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/pickerhelper.hxx" #include "svtools/poolitem.hxx" -#include "svtools/printwarningoptions.hxx" +#include "unotools/printwarningoptions.hxx" #include "svtools/ptitem.hxx" #include "svtools/rectitem.hxx" #include "svtools/rngitem.hxx" #include "svtools/rtfkeywd.hxx" #include "svtools/rtfout.hxx" #include "svtools/rtftoken.h" -#include "svtools/saveopt.hxx" -#include "svtools/searchopt.hxx" -#include "svtools/securityoptions.hxx" +#include "unotools/saveopt.hxx" +#include "unotools/searchopt.hxx" +#include "unotools/securityoptions.hxx" #include "svtools/sfontitm.hxx" #include "svtools/slstitm.hxx" #include "svtools/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/sourceviewconfig.hxx" -#include "svtools/startoptions.hxx" +#include "unotools/sourceviewconfig.hxx" +#include "unotools/startoptions.hxx" #include "svtools/stdmenu.hxx" #include "svtools/stringtransfer.hxx" #include "svtools/stritem.hxx" @@ -839,13 +839,13 @@ #include "svtools/transfer.hxx" #include "svtools/txtcmp.hxx" #include "svtools/undo.hxx" -#include "svtools/undoopt.hxx" +#include "unotools/undoopt.hxx" #include "svtools/unoevent.hxx" #include "svtools/unoimap.hxx" #include "svtools/urihelper.hxx" #include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/useroptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/visitem.hxx" #include "svtools/whiter.hxx" #include "sys/stat.h" diff --git a/svx/source/cui/SpellDialog.cxx b/svx/source/cui/SpellDialog.cxx index bead9b97bf..9de0626fe3 100644 --- a/svx/source/cui/SpellDialog.cxx +++ b/svx/source/cui/SpellDialog.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -496,7 +496,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) if( aImageSize.Height() ) { aVendorSize.Height() = aImageSize.Height(); - if(aVendorSize.Width() < aImageSize.Width()) + if(aVendorSize.Width() < aImageSize.Width()) aVendorSize.Width() = aImageSize.Width(); pThis->aVendorImageFI.SetSizePixel( aVendorSize ); } @@ -507,7 +507,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) &pThis->aLanguageFT, &pThis->aLanguageLB, &pThis->aNotInDictFT, - &pThis->aSentenceED, + &pThis->aSentenceED, &pThis->aSuggestionFT, &pThis->aSuggestionLB, &pThis->aIgnorePB, @@ -538,9 +538,9 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG ) aDlgSize.Height() += nDiff; pThis->SetSizePixel( aDlgSize ); pThis->Invalidate(); - } - } - pThis->aCheckGrammarCB.Check( pThis->rParent.IsGrammarChecking() ); + } + } + pThis->aCheckGrammarCB.Check( pThis->rParent.IsGrammarChecking() ); pThis->SetUpdateMode( sal_True ); pThis->Show(); return 0; @@ -583,7 +583,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, Button *, pBtn ) // ----------------------------------------------------------------------- IMPL_LINK( SpellDialog, CheckGrammarHdl, CheckBox*, pBox ) { - rParent.SetGrammarChecking( pBox->IsChecked() ); + rParent.SetGrammarChecking( pBox->IsChecked() ); Impl_Restore(); return 0; } @@ -702,13 +702,13 @@ IMPL_LINK( SpellDialog, IgnoreAllHdl, Button *, pButton ) { if( pSpellErrorDescription && pSpellErrorDescription->xGrammarChecker.is() ) { - pSpellErrorDescription->xGrammarChecker->ignoreRule( pSpellErrorDescription->sRuleId, + pSpellErrorDescription->xGrammarChecker->ignoreRule( pSpellErrorDescription->sRuleId, pSpellErrorDescription->aLocale ); } } catch( const uno::Exception& ) { - } + } } else { @@ -860,7 +860,7 @@ IMPL_LINK(SpellDialog, LanguageSelectHdl, SvxLanguageBox*, pBox) LanguageType eLanguage = pBox->GetSelectLanguage(); Reference xAlt = xSpell->spell( sError, eLanguage, Sequence< PropertyValue >() ); - if( xAlt.is() ) + if( xAlt.is() ) aSentenceED.SetAlternatives( xAlt ); else { @@ -915,7 +915,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) if( pSpellErrorDescription && pSpellErrorDescription->sServiceName.getLength() ) { bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; - ::rtl::OUString sSuggestionImageUrl = + ::rtl::OUString sSuggestionImageUrl = SvtLinguConfig().GetSpellAndGrammarDialogImage( pSpellErrorDescription->sServiceName, bHighContrast ); aVendorImageFI.SetImage( lcl_GetImageFromPngUrl( sSuggestionImageUrl ) ); uno::Reference< lang::XServiceDisplayName > xDisplayName( pSpellErrorDescription->xGrammarChecker, uno::UNO_QUERY ); @@ -924,7 +924,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) } else { - bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; + bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; aVendorImageFI.SetImage( bHighContrast ? aVendorImageHC : aVendorImage ); } @@ -932,7 +932,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) { sTitle = m_sTitleSpellingGrammarVendor; sTitle.SearchAndReplaceAscii( "$VendorName", sVendor ); - } + } else { //bool bHighContrast = GetDisplayBackground().GetColor().IsDark() != 0; @@ -1227,14 +1227,14 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence) ::rtl::OUString sServiceName; if( xNamed.is() ) sServiceName = xNamed->getName(); - SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(), + SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(), aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), 0, sServiceName); aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (USHORT) nStartPosition, (USHORT) nEndPosition ); } else if(aStart->bIsGrammarError ) { uno::Reference< lang::XServiceInfo > xInfo( aStart->xGrammarChecker, uno::UNO_QUERY ); - SpellErrorDescription aDesc( true, + SpellErrorDescription aDesc( true, aStart->sText, SvxCreateLocale( aStart->eLanguage ), aStart->aGrammarError.aSuggestions, @@ -1859,7 +1859,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA TextPaM aCursor(0, m_nErrorStart); DBG_ASSERT(static_cast( GetTextEngine()->FindAttrib( aCursor, TEXTATTR_SPELL_ERROR)), "no error set?"); - + ::rtl::OUString aWord; lang::Locale aLocale; uno::Sequence< ::rtl::OUString > aAlts; @@ -2152,13 +2152,13 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet) -----------------------------------------------------------------------*/ ExplainButton::~ExplainButton() { -} +} /*-- 30.06.2008 14:15:19--------------------------------------------------- -----------------------------------------------------------------------*/ void ExplainButton::RequestHelp( const HelpEvent& ) { - Help::ShowBalloon( this, GetPosPixel(), m_sExplanation ); + Help::ShowBalloon( this, GetPosPixel(), m_sExplanation ); } void ExplainButton::Click() diff --git a/svx/source/cui/backgrnd.cxx b/svx/source/cui/backgrnd.cxx index f297f052e8..4e70365223 100644 --- a/svx/source/cui/backgrnd.cxx +++ b/svx/source/cui/backgrnd.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #endif // include --------------------------------------------------------------- -#include +#include #include #include #include diff --git a/svx/source/cui/chardlg.cxx b/svx/source/cui/chardlg.cxx index 7a717188c2..c67c6f40c8 100644 --- a/svx/source/cui/chardlg.cxx +++ b/svx/source/cui/chardlg.cxx @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/cuigaldlg.cxx b/svx/source/cui/cuigaldlg.cxx index 3c3bb1364e..1696462522 100644 --- a/svx/source/cui/cuigaldlg.cxx +++ b/svx/source/cui/cuigaldlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include "opengrf.hxx" #include "impgrf.hxx" diff --git a/svx/source/cui/cuihyperdlg.cxx b/svx/source/cui/cuihyperdlg.cxx index 3eb69780d8..f5235a7a12 100644 --- a/svx/source/cui/cuihyperdlg.cxx +++ b/svx/source/cui/cuihyperdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include "cuihyperdlg.hxx" diff --git a/svx/source/cui/cuisrchdlg.cxx b/svx/source/cui/cuisrchdlg.cxx index 6cbe6268d0..238cfb4432 100644 --- a/svx/source/cui/cuisrchdlg.cxx +++ b/svx/source/cui/cuisrchdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/svx/source/cui/dbregisterednamesconfig.cxx index 3fdfa74f9d..08508314b1 100644 --- a/svx/source/cui/dbregisterednamesconfig.cxx +++ b/svx/source/cui/dbregisterednamesconfig.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include "dbregistersettings.hxx" #include "connpooloptions.hxx" @@ -169,7 +169,7 @@ namespace svx } if (bNeedCommit) aDbRegisteredNamesRoot.commit(); - + // delete unused entry Sequence< ::rtl::OUString > aDriverKeys = xDatabaseContext->getElementNames(); const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray(); diff --git a/svx/source/cui/eventdlg.cxx b/svx/source/cui/eventdlg.cxx index b1ddbe6398..0f6c92518c 100644 --- a/svx/source/cui/eventdlg.cxx +++ b/svx/source/cui/eventdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,8 +52,8 @@ #include #include #include -#include - +#include + #include "headertablistbox.hxx" #include "macropg_impl.hxx" @@ -94,7 +94,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); - aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage, + aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage, SelectHdl_Impl ) ); uno::Reference< document::XEventsSupplier > xSupplier; @@ -193,7 +193,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox ) bool* bApp = (bool*) aSaveInListBox.GetEntryData( aSaveInListBox.GetSelectEntryPos()); - + mpImpl->pEventLB->SetUpdateMode( FALSE ); bAppConfig = *bApp; if ( *bApp ) diff --git a/svx/source/cui/fontsubs.cxx b/svx/source/cui/fontsubs.cxx index 9c35b1a833..665f7e2562 100644 --- a/svx/source/cui/fontsubs.cxx +++ b/svx/source/cui/fontsubs.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #ifndef _OFA_FONTSUBSTCONFIG_HXX #include #endif -#include +#include #include "fontsubs.hrc" #include "fontsubs.hxx" @@ -85,7 +85,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, sAutomatic (SVX_RES( STR_AUTOMATIC )), pConfig(new SvtFontSubstConfig), - pSourceViewConfig(new svt::SourceViewConfig), + pSourceViewConfig(new utl::SourceViewConfig), sHeader1 (SVX_RES( STR_HEADER1 )), sHeader2 (SVX_RES( STR_HEADER2 )), diff --git a/svx/source/cui/fontsubs.hxx b/svx/source/cui/fontsubs.hxx index c4ea5416a0..06105815c9 100644 --- a/svx/source/cui/fontsubs.hxx +++ b/svx/source/cui/fontsubs.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,6 +36,11 @@ #include #include +namespace utl +{ + class SourceViewConfig; +}; + // class SvxFontSubstCheckListBox ------------------------------------------ class SvxFontSubstCheckListBox : public SvxSimpleTable @@ -88,7 +93,7 @@ class SvxFontSubstTabPage : public SfxTabPage String sAutomatic; SvtFontSubstConfig* pConfig; - svt::SourceViewConfig* pSourceViewConfig; + utl::SourceViewConfig* pSourceViewConfig; String sHeader1; String sHeader2; diff --git a/svx/source/cui/hangulhanjadlg.cxx b/svx/source/cui/hangulhanjadlg.cxx index 1ee49881f0..4f0e7409f0 100644 --- a/svx/source/cui/hangulhanjadlg.cxx +++ b/svx/source/cui/hangulhanjadlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,8 +48,8 @@ #include #include #include -#include -#include +#include +#include //#ifndef _COM_SUN_STAR_FRAME_XSTORABLE_HPP_ //#include //#endif @@ -890,8 +890,8 @@ namespace svx return m_aReplaceByChar.IsChecked(); } //------------------------------------------------------------------------- - void HangulHanjaConversionDialog::SetConversionDirectionState( - sal_Bool _bTryBothDirections, + void HangulHanjaConversionDialog::SetConversionDirectionState( + sal_Bool _bTryBothDirections, HHC::ConversionDirection _ePrimaryConversionDirection ) { // default state: try both direction @@ -918,7 +918,7 @@ namespace svx } //------------------------------------------------------------------------- - HHC::ConversionDirection HangulHanjaConversionDialog::GetDirection( + HHC::ConversionDirection HangulHanjaConversionDialog::GetDirection( HHC::ConversionDirection eDefaultDirection ) const { HHC::ConversionDirection eDirection = eDefaultDirection; @@ -1684,7 +1684,7 @@ namespace svx OUString aOrg( m_aOriginal ); Sequence< OUString > aEntries; GetConversions( xDict, m_aOriginal, aEntries ); - + sal_uInt32 n = aEntries.getLength(); OUString* pEntry = aEntries.getArray(); while( n ) @@ -1799,7 +1799,7 @@ namespace svx } m_bModifiedSuggestions=false; } - + m_aScrollSB.SetThumbPos( 0 ); UpdateScrollbar(); // will force edits to be filled new } @@ -1820,7 +1820,7 @@ namespace svx void HangulHanjaEditDictDialog::EditModify( Edit* _pEdit, sal_uInt8 _nEntryOffset ) { m_bModifiedSuggestions = true; - + String aTxt( _pEdit->GetText() ); sal_uInt16 nEntryNum = m_nTopPos + _nEntryOffset; if( aTxt.Len() == 0 ) @@ -1836,7 +1836,7 @@ namespace svx m_pSuggestions = new SuggestionList( MAXNUM_SUGGESTIONS ); m_pSuggestions->Set( aTxt, nEntryNum ); } - + UpdateButtonStates(); } diff --git a/svx/source/cui/hldocntp.cxx b/svx/source/cui/hldocntp.cxx index 3bd3bb6c8b..eca4c5b43e 100644 --- a/svx/source/cui/hldocntp.cxx +++ b/svx/source/cui/hldocntp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/cui/hlinettp.cxx b/svx/source/cui/hlinettp.cxx index 177affd720..90b0f8042d 100644 --- a/svx/source/cui/hlinettp.cxx +++ b/svx/source/cui/hlinettp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,8 +35,8 @@ #undef SVX_DLLIMPLEMENTATION #endif #include -#include -#include +#include +#include #include "hlinettp.hxx" #include "hyperdlg.hrc" diff --git a/svx/source/cui/hlmailtp.cxx b/svx/source/cui/hlmailtp.cxx index 283d9d243a..57787069f2 100644 --- a/svx/source/cui/hlmailtp.cxx +++ b/svx/source/cui/hlmailtp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include #include "hlmailtp.hxx" #include "hyperdlg.hrc" @@ -116,7 +116,7 @@ void SvxHyperlinkMailTp::FillDlgFields ( String& aStrURL ) // set URL-field and additional controls String aStrURLc ( aStrURL ); - // set additional controls for EMail: + // set additional controls for EMail: if ( aStrScheme.SearchAscii( sMailtoScheme ) == 0 ) { // Find mail-subject @@ -219,7 +219,7 @@ void SvxHyperlinkMailTp::SetScheme( const String& aScheme ) const sal_Char sNewsScheme[] = INET_NEWS_SCHEME; BOOL bMail = aScheme.SearchAscii( sNewsScheme ) != 0; - + //update protocol button selection: maRbtMail.Check(bMail); maRbtNews.Check(!bMail); @@ -267,7 +267,7 @@ INetProtocol SvxHyperlinkMailTp::GetSmartProtocolFromButtons() const if( maRbtNews.IsChecked() ) { return INET_PROT_NEWS; - } + } return INET_PROT_MAILTO; } diff --git a/svx/source/cui/iconcdlg.cxx b/svx/source/cui/iconcdlg.cxx index 7bd9843fb2..8058041662 100644 --- a/svx/source/cui/iconcdlg.cxx +++ b/svx/source/cui/iconcdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #ifndef _SVX_DIALOGS_HRC #include #endif -#include +#include #include #include #include diff --git a/svx/source/cui/multipat.cxx b/svx/source/cui/multipat.cxx index ce074bcb87..c9633fa613 100644 --- a/svx/source/cui/multipat.cxx +++ b/svx/source/cui/multipat.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ #include #include -#include +#include using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx index a9ba8c61cb..faa0d971b7 100644 --- a/svx/source/cui/numpages.cxx +++ b/svx/source/cui/numpages.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/optchart.cxx b/svx/source/cui/optchart.cxx index 9e6322155a..e2d3033e30 100644 --- a/svx/source/cui/optchart.cxx +++ b/svx/source/cui/optchart.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include +#include #include diff --git a/svx/source/cui/optcolor.cxx b/svx/source/cui/optcolor.cxx index 887be321ab..aaae557f1f 100644 --- a/svx/source/cui/optcolor.cxx +++ b/svx/source/cui/optcolor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include #include #include //CHINA001 #ifndef _SVX_DLG_NAME_HXX @@ -524,7 +524,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aBasicErrorFT(this, ResId( FT_BASICERROR, *rResId.GetResMgr())), aBasicErrorLB(this, ResId( LB_BASICERROR, *rResId.GetResMgr())), aBasicErrorWN(this, ResId( WN_BASICERROR, *rResId.GetResMgr())), - + aSQLBackWN(this), aSQLFT(this, ResId( FT_SQL_COMMAND, *rResId.GetResMgr())), aSQLIdentifierFT(this, ResId( FT_SQLIDENTIFIER, *rResId.GetResMgr())), @@ -550,7 +550,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe aSQLParameterFT(this, ResId( FT_SQLPARAMETER, *rResId.GetResMgr())), aSQLParameterLB(this, ResId( LB_SQLPARAMETER, *rResId.GetResMgr())), aSQLParameterWN(this, ResId( WN_SQLPARAMETER, *rResId.GetResMgr())), - + aSQLCommentFT(this, ResId( FT_SQLCOMMENT, *rResId.GetResMgr())), aSQLCommentLB(this, ResId( LB_SQLCOMMENT, *rResId.GetResMgr())), aSQLCommentWN(this, ResId( WN_SQLCOMMENT, *rResId.GetResMgr())) diff --git a/svx/source/cui/optfltr.cxx b/svx/source/cui/optfltr.cxx index f8d185f107..d7177d383d 100644 --- a/svx/source/cui/optfltr.cxx +++ b/svx/source/cui/optfltr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,9 +36,9 @@ #endif // include --------------------------------------------------------------- -#include +#include -#include +#include #include "optfltr.hxx" #include "optfltr.hrc" #include diff --git a/svx/source/cui/optgdlg.cxx b/svx/source/cui/optgdlg.cxx index 12910c0302..9827d9a36b 100644 --- a/svx/source/cui/optgdlg.cxx +++ b/svx/source/cui/optgdlg.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include @@ -46,14 +46,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include -#include +#include #include #include #include @@ -89,7 +89,7 @@ #include #include -#include +#include #include #include @@ -537,7 +537,7 @@ CanvasSettings::CanvasSettings() : Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory(); Reference xConfigProvider( xFactory->createInstance( - OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), UNO_QUERY_THROW ); Any propValue( @@ -549,10 +549,10 @@ CanvasSettings::CanvasSettings() : mxForceFlagNameAccess.set( xConfigProvider->createInstanceWithArguments( OUString::createFromAscii("com.sun.star.configuration.ConfigurationUpdateAccess"), - Sequence( &propValue, 1 ) ), + Sequence( &propValue, 1 ) ), UNO_QUERY_THROW ); - propValue = makeAny( + propValue = makeAny( PropertyValue( OUString::createFromAscii("nodepath"), -1, makeAny( OUString::createFromAscii("/org.openoffice.Office.Canvas/CanvasServiceList") ), @@ -571,7 +571,7 @@ CanvasSettings::CanvasSettings() : while( pCurr != pEnd ) { Reference xEntryNameAccess( - xHierarchicalNameAccess->getByHierarchicalName(*pCurr), + xHierarchicalNameAccess->getByHierarchicalName(*pCurr), UNO_QUERY ); if( xEntryNameAccess.is() ) @@ -607,9 +607,9 @@ BOOL CanvasSettings::IsHardwareAccelerationAvailable() const const OUString* pCurrImpl = aCurr->second.getConstArray(); const OUString* const pEndImpl = pCurrImpl + aCurr->second.getLength(); - while( pCurrImpl != pEndImpl ) + while( pCurrImpl != pEndImpl ) { - try + try { Reference xPropSet( xFactory->createInstance( pCurrImpl->trim() ), @@ -622,7 +622,7 @@ BOOL CanvasSettings::IsHardwareAccelerationAvailable() const return mbHWAccelAvailable; } } - catch (Exception &) + catch (Exception &) {} ++pCurrImpl; @@ -651,16 +651,16 @@ BOOL CanvasSettings::IsHardwareAccelerationEnabled() const // ------------------------------------------------------------------- void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const { - Reference< XNameReplace > xNameReplace( + Reference< XNameReplace > xNameReplace( mxForceFlagNameAccess, UNO_QUERY ); if( !xNameReplace.is() ) return; - + xNameReplace->replaceByName( OUString::createFromAscii("ForceSafeServiceImpl"), makeAny(!_bEnabled) ); - Reference< XChangesBatch > xChangesBatch( + Reference< XChangesBatch > xChangesBatch( mxForceFlagNameAccess, UNO_QUERY ); if( !xChangesBatch.is() ) diff --git a/svx/source/cui/optgenrl.cxx b/svx/source/cui/optgenrl.cxx index dd30e74da2..57d4482255 100644 --- a/svx/source/cui/optgenrl.cxx +++ b/svx/source/cui/optgenrl.cxx @@ -39,13 +39,13 @@ #include #include #include -#include +#include #define _SVX_OPTGENRL_CXX #include #include "optgenrl.hrc" -#include +#include #include "cuioptgenrl.hxx" #include #include "dlgutil.hxx" diff --git a/svx/source/cui/optinet2.cxx b/svx/source/cui/optinet2.cxx index 2a74cc6761..f3a795f09e 100644 --- a/svx/source/cui/optinet2.cxx +++ b/svx/source/cui/optinet2.cxx @@ -55,7 +55,7 @@ #ifndef _CNTWIDS_HRC #include #endif -#include +#include #ifndef _SV_SVAPP_HXX #include #endif @@ -64,15 +64,15 @@ #include #include #include -#include +#include #ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX -#include +#include #endif #ifndef _SVTOOLS_JAVAPTIONS_HXX -#include +#include #endif #include -#include +#include #include #define _SVX_OPTINET2_CXX #include diff --git a/svx/source/cui/optjava.cxx b/svx/source/cui/optjava.cxx index d9b2acc3f0..c280232306 100644 --- a/svx/source/cui/optjava.cxx +++ b/svx/source/cui/optjava.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/optjsearch.cxx b/svx/source/cui/optjsearch.cxx index 720fa6eec5..220875b88d 100644 --- a/svx/source/cui/optjsearch.cxx +++ b/svx/source/cui/optjsearch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include -#include +#include #include #ifndef _SVX_DIALOGS_HRC diff --git a/svx/source/cui/optmemory.cxx b/svx/source/cui/optmemory.cxx index e3befab80e..16dd8ae5d3 100644 --- a/svx/source/cui/optmemory.cxx +++ b/svx/source/cui/optmemory.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,19 +40,19 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #ifndef INCLUDED_SVTOOLS_MISCPOPT_HXX #include diff --git a/svx/source/cui/optpath.cxx b/svx/source/cui/optpath.cxx index ec589678b2..be9cdfd096 100644 --- a/svx/source/cui/optpath.cxx +++ b/svx/source/cui/optpath.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,11 +49,11 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #define _SVX_OPTPATH_CXX @@ -202,7 +202,7 @@ long SvxControlFocusHelper::Notify( NotifyEvent& rNEvt ) BOOL IsMultiPath_Impl( const USHORT nIndex ) { -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 1 return ( SvtPathOptions::PATH_AUTOCORRECT == nIndex || SvtPathOptions::PATH_AUTOTEXT == nIndex || SvtPathOptions::PATH_BASIC == nIndex || @@ -343,10 +343,10 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) case SvtPathOptions::PATH_GRAPHIC: case SvtPathOptions::PATH_TEMP: case SvtPathOptions::PATH_TEMPLATE: -#if OSL_DEBUG_LEVEL > 1 +#if OSL_DEBUG_LEVEL > 1 case SvtPathOptions::PATH_LINGUISTIC: case SvtPathOptions::PATH_DICTIONARY: -#endif +#endif case SvtPathOptions::PATH_WORK: { String aStr( SVX_RES( RID_SVXSTR_PATH_NAME_START + i ) ); @@ -549,7 +549,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) // Reset also last used dir in the sfx application instance SfxApplication *pSfxApp = SFX_APP(); pSfxApp->ResetLastDir(); - + // Set configuration flag to notify file picker that it's necessary // to take over the path provided. Reference < XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() ); diff --git a/svx/source/cui/optsave.cxx b/svx/source/cui/optsave.cxx index 18385e584b..437f5f0fc5 100644 --- a/svx/source/cui/optsave.cxx +++ b/svx/source/cui/optsave.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include diff --git a/svx/source/cui/postdlg.cxx b/svx/source/cui/postdlg.cxx index 24545df391..5c50d1a433 100644 --- a/svx/source/cui/postdlg.cxx +++ b/svx/source/cui/postdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #endif #include #include -#include +#include #include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include diff --git a/svx/source/cui/securityoptions.cxx b/svx/source/cui/securityoptions.cxx index 8689d911ec..a55e904a48 100644 --- a/svx/source/cui/securityoptions.cxx +++ b/svx/source/cui/securityoptions.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #ifndef INCLUDED_SVTOOLS_SECURITIYOPTIONS_HXX -#include +#include #endif #include #include diff --git a/svx/source/cui/tabarea.cxx b/svx/source/cui/tabarea.cxx index 721154a9a9..2c68adae7b 100644 --- a/svx/source/cui/tabarea.cxx +++ b/svx/source/cui/tabarea.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include #include #include diff --git a/svx/source/cui/tabline.cxx b/svx/source/cui/tabline.cxx index 2479a22956..9b049973cd 100644 --- a/svx/source/cui/tabline.cxx +++ b/svx/source/cui/tabline.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include #include @@ -208,7 +208,7 @@ void SvxLineTabDialog::SavePalettes() // ToolBoxControls werden benachrichtigt: if ( pShell ) pShell->PutItem( SvxColorTableItem( pColorTab, SID_COLOR_TABLE ) ); - } + } } // ----------------------------------------------------------------------- diff --git a/svx/source/cui/tpbitmap.cxx b/svx/source/cui/tpbitmap.cxx index febfa18e90..74d3da95c2 100644 --- a/svx/source/cui/tpbitmap.cxx +++ b/svx/source/cui/tpbitmap.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include #endif -#include +#include #include #include #include @@ -116,7 +116,7 @@ SvxBitmapTabPage::SvxBitmapTabPage aBtnDelete ( this, SVX_RES( BTN_DELETE ) ), aBtnLoad ( this, SVX_RES( BTN_LOAD ) ), aBtnSave ( this, SVX_RES( BTN_SAVE ) ), - + aBitmapCtl ( this, aCtlPreview.GetSizePixel() ), rOutAttrs ( rInAttrs ), diff --git a/svx/source/cui/tpcolor.cxx b/svx/source/cui/tpcolor.cxx index a373c985f3..ec03cc6d02 100644 --- a/svx/source/cui/tpcolor.cxx +++ b/svx/source/cui/tpcolor.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #include #include -#include +#include #include #include #include @@ -98,13 +98,13 @@ SvxColorTabPage::SvxColorTabPage aEdtName ( this, SVX_RES( EDT_NAME ) ), aFtColor ( this, SVX_RES( FT_COLOR ) ), aLbColor ( this, SVX_RES( LB_COLOR ) ), - + aTableNameFT ( this, SVX_RES( FT_TABLE_NAME ) ), aValSetColorTable ( this, SVX_RES( CTL_COLORTABLE ) ), - + aCtlPreviewOld ( this, SVX_RES( CTL_PREVIEW_OLD ) ), aCtlPreviewNew ( this, SVX_RES( CTL_PREVIEW_NEW ) ), - + aLbColorModel ( this, SVX_RES( LB_COLORMODEL ) ), aFtColorModel1 ( this, SVX_RES( FT_1 ) ), aMtrFldColorModel1 ( this, SVX_RES( MTR_FLD_1 ) ), diff --git a/svx/source/cui/tpgradnt.cxx b/svx/source/cui/tpgradnt.cxx index 99f8b357b8..0fa8ab445b 100644 --- a/svx/source/cui/tpgradnt.cxx +++ b/svx/source/cui/tpgradnt.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" @@ -103,7 +103,7 @@ SvxGradientTabPage::SvxGradientTabPage aBtnDelete ( this, SVX_RES( BTN_DELETE ) ), aBtnLoad ( this, SVX_RES( BTN_LOAD ) ), aBtnSave ( this, SVX_RES( BTN_SAVE ) ), - + rOutAttrs ( rInAttrs ), pColorTab( NULL ), @@ -159,7 +159,7 @@ SvxGradientTabPage::SvxGradientTabPage LINK( this, SvxGradientTabPage, ClickLoadHdl_Impl ) ); aBtnSave.SetClickHdl( LINK( this, SvxGradientTabPage, ClickSaveHdl_Impl ) ); - + // #i76307# always paint the preview in LTR, because this is what the document does aCtlPreview.EnableRTL( FALSE ); } diff --git a/svx/source/cui/tphatch.cxx b/svx/source/cui/tphatch.cxx index 42f576836b..c1090bedf9 100644 --- a/svx/source/cui/tphatch.cxx +++ b/svx/source/cui/tphatch.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include #include #include @@ -105,7 +105,7 @@ SvxHatchTabPage::SvxHatchTabPage aBtnDelete ( this, SVX_RES( BTN_DELETE ) ), aBtnLoad ( this, SVX_RES( BTN_LOAD ) ), aBtnSave ( this, SVX_RES( BTN_SAVE ) ), - + rOutAttrs ( rInAttrs ), pColorTab( NULL ), pHatchingList( NULL ), diff --git a/svx/source/cui/tplnedef.cxx b/svx/source/cui/tplnedef.cxx index e370b4a8c8..aa99fca259 100644 --- a/svx/source/cui/tplnedef.cxx +++ b/svx/source/cui/tplnedef.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -107,7 +107,7 @@ SvxLineDefTabPage::SvxLineDefTabPage aBtnLoad ( this, SVX_RES( BTN_LOAD ) ), aBtnSave ( this, SVX_RES( BTN_SAVE ) ), aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), - + rOutAttrs ( rInAttrs ), pXPool ( (XOutdevItemPool*) rInAttrs.GetPool() ), diff --git a/svx/source/cui/tplneend.cxx b/svx/source/cui/tplneend.cxx index e30e5b9e8d..c43aa41989 100644 --- a/svx/source/cui/tplneend.cxx +++ b/svx/source/cui/tplneend.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" diff --git a/svx/source/cui/treeopt.cxx b/svx/source/cui/treeopt.cxx index d1be63e327..32da416f0c 100644 --- a/svx/source/cui/treeopt.cxx +++ b/svx/source/cui/treeopt.cxx @@ -71,16 +71,16 @@ #include #endif #include -#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index cd828cfaa8..6307ea5e2d 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -65,7 +65,7 @@ #include #include #include -#include +#include #include #define RET_BACK 100 diff --git a/svx/source/dialog/hangulhanja.cxx b/svx/source/dialog/hangulhanja.cxx index cb7ef22f73..bb9848df9c 100644 --- a/svx/source/dialog/hangulhanja.cxx +++ b/svx/source/dialog/hangulhanja.cxx @@ -34,8 +34,8 @@ #include //add CHINA001 #include // header for class SvtLinguConfig -#include -#include +#include +#include #include #include diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 3bb5f0b6b1..26cde248d6 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include "hyperdlg.hxx" #include //CHINA001 #include diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index ee7c272fcc..4956823903 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -72,7 +72,7 @@ public: -----------------------------------------------------------------------*/ SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() : - ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) + ConfigItem(OUString::createFromAscii("Inet/DefaultSearchEngine")) { uno::Sequence aNames(1); aNames.getArray()[0] = OUString::createFromAscii("Name"); @@ -119,10 +119,10 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : FreeResource(); mpManager = SfxImageManager::GetImageManager( 0 ); - mpManager->RegisterToolBox( this ); - + mpManager->RegisterToolBox( this ); + SetImages(); - + // save initial size nMaxWidth = GetSizePixel().Width(); nMaxHeight = GetSizePixel().Height(); @@ -188,9 +188,9 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : // Hide button according to config item. SvtCommandOptions aCmdOpts; - if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( + if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED, + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( "InternetSearch" ) ) ) ) HideItem( BTN_INET_SEARCH ); } @@ -202,7 +202,7 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) : SvxHyperlinkDlg::~SvxHyperlinkDlg() { SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this); - + if (pTargetMenu != NULL) delete pTargetMenu; } @@ -419,14 +419,14 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) String sTest(rData.sEngineName); sTest.ToLowerAscii(); bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault ); - //then put it at the top + //then put it at the top if(i && bIsDefaultEngine) { pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0); pMenu->InsertSeparator(1); - } + } else - { + { if (i) pMenu->InsertSeparator(); pMenu->InsertItem( i + 1, rData.sEngineName); @@ -439,7 +439,7 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox ) delete pMenu; } break; - + case BTN_TARGET: { // Target Frame einstellen @@ -837,7 +837,7 @@ void SvxHyperlinkDlg::SetImages() SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK, bHighContrast ) ); SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH, bHighContrast ) ); SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET, bHighContrast ) ); - SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); + SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG, bHighContrast ) ); } /*-------------------------------------------------------------------- diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 9cf1e4cb46..62cb5a4839 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include @@ -196,7 +196,7 @@ void SvxIMapDlgChildWindow::UpdateIMapDlg( const Graphic& rGraphic, const ImageM SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, Window* _pParent, const ResId& rResId ) : SfxModelessDialog ( _pBindings, pCW, _pParent, rResId ), - + aTbxIMapDlg1 ( this, SVX_RES( TBX_IMAPDLG1 ) ), aFtURL ( this, SVX_RES( FT_URL ) ), maURLBox ( this, SVX_RES( CBB_URL ) ), diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index d02e2b9ee3..51005adb84 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index f6564449ae..9abaeb6b38 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #endif #include #include -#include +#include #include #include "opengrf.hxx" diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 670264aae4..c6d5101a9d 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 5f89bbda4e..6a4aecc293 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include @@ -355,8 +355,8 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) sPrefixes[i].getStr()[0] != 0) { pVDev->SetFont(aFont); - pVDev->DrawText(aLeft, sPrefixes[i]); - aLeft.X() += pDev->GetTextWidth(sPrefixes[i]); + pVDev->DrawText(aLeft, sPrefixes[i]); + aLeft.X() += pDev->GetTextWidth(sPrefixes[i]); } if(aParentNumberings[i]) { diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 0745a5e259..4d455987bd 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -369,7 +369,7 @@ Sequence SvxSwAutoCorrCfg::GetPropertyNames() "Format/Option/ChangeToBullets/Enable", //15 "Format/Option/ChangeToBullets/SpecialCharacter/Char", //16 "Format/Option/ChangeToBullets/SpecialCharacter/Font", //17 - "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily", //18 + "Format/Option/ChangeToBullets/SpecialCharacter/FontFamily", //18 "Format/Option/ChangeToBullets/SpecialCharacter/FontCharset", //19 "Format/Option/ChangeToBullets/SpecialCharacter/FontPitch", //20 "Format/Option/ReplaceQuote", //21 diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx index 39cc8debaa..0ec73b2dd6 100644 --- a/svx/source/editeng/editview.cxx +++ b/svx/source/editeng/editview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ #include #include #include -#include +#include using ::rtl::OUString; @@ -521,10 +521,10 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) pImpEditView->DrawSelection(); PIMPEE->UndoActionStart( EDITUNDO_RESETATTRIBS ); EditSelection aSelection( pImpEditView->GetEditSelection() ); - + for (sal_uInt16 nWID = EE_ITEMS_START; nWID <= EE_ITEMS_END; ++nWID) { - bool bIsLang = EE_CHAR_LANGUAGE == nWID || + bool bIsLang = EE_CHAR_LANGUAGE == nWID || EE_CHAR_LANGUAGE_CJK == nWID || EE_CHAR_LANGUAGE_CTL == nWID; if (!bIsLang) @@ -533,7 +533,7 @@ void EditView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs ) PIMPEE->UndoActionEnd( EDITUNDO_RESETATTRIBS ); PIMPEE->FormatAndUpdate( this ); -} +} void EditView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich ) { @@ -1439,7 +1439,7 @@ void EditView::ChangeFontSize( bool bGrow, const FontList* pFontList ) { USHORT nPortionEnd = aPortions.GetObject( nPos ); USHORT nPortionStart = nPos > 0 ? aPortions.GetObject( nPos - 1 ) : 0; - + if( (nPortionEnd < nBeginPos) || (nPortionStart > nEndPos) ) continue; @@ -1494,7 +1494,7 @@ bool EditView::ChangeFontSize( bool bGrow, SfxItemSet& rSet, const FontList* pFo nHeight = *pAry; break; } - pAry++; + pAry++; } if( *pAry == 0 ) diff --git a/svx/source/editeng/unolingu.cxx b/svx/source/editeng/unolingu.cxx index d6a2d2d96e..65d5c3b0c2 100644 --- a/svx/source/editeng/unolingu.cxx +++ b/svx/source/editeng/unolingu.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -57,7 +57,7 @@ #include #include // helper for implementations #include -#include +#include #include #include #include @@ -422,7 +422,7 @@ void SvxLinguConfigUpdate::UpdateAll( sal_Bool bForceCheck ) // In OOo 3.0 we will not need the respective code anymore at all. // aAny <<= nCurrentDataFilesChangedCheckValue; aAny <<= (INT32) -1; // keep the value set to 'need to check' - + aCfg.SetProperty( A2OU( "DataFilesChangedCheckValue" ), aAny ); //! Note 1: the new values are commited when the 'aCfg' object diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c5af260f72..7f9680e879 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -816,8 +816,8 @@ namespace svxform // create a resource manager, for the svx resource file // and the UI locale ByteString aResourceFile( "svx" ); - ResMgr* pResMgr = ResMgr::CreateResMgr( - aResourceFile.GetBuffer(), + ResMgr* pResMgr = ResMgr::CreateResMgr( + aResourceFile.GetBuffer(), Application::GetSettings().GetUILocale() ); // load the resources for the AddSubmission modal dialog. @@ -833,7 +833,7 @@ namespace svxform // clean up: remove context, and delete the resource manager // ( Increment(..) is needed since PopContext() requires that // the file pointer is at the end. ) - pResMgr->Increment( pResMgr->GetRemainSize() ); + pResMgr->Increment( pResMgr->GetRemainSize() ); pResMgr->PopContext(); delete pResMgr; } @@ -1608,10 +1608,10 @@ namespace svxform ActivatePageHdl( &m_aTabCtrl ); // get our frame - DBG_ASSERT( pBindings != NULL, + DBG_ASSERT( pBindings != NULL, "DataNavigatorWindow::LoadModels(): no SfxBindings; can't get frame" ); - m_xFrame = Reference( - pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface(), + m_xFrame = Reference( + pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY ); DBG_ASSERT( m_xFrame.is(), "DataNavigatorWindow::LoadModels(): no frame" ); // add frameaction listener @@ -3566,13 +3566,13 @@ namespace svxform } } - // #i36342# we need a temporary binding; create one if no existing binding + // #i36342# we need a temporary binding; create one if no existing binding // is found if( !m_xTempBinding.is() ) { - m_xCreatedBinding = m_xUIHelper->getBindingForNode( - Reference( - xModel->getDefaultInstance()->getDocumentElement(), + m_xCreatedBinding = m_xUIHelper->getBindingForNode( + Reference( + xModel->getDefaultInstance()->getDocumentElement(), UNO_QUERY_THROW ), sal_True ); m_xTempBinding = m_xCreatedBinding; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 7ae8d6a811..a0c7541f48 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 26a5ecd7dd..43112f14a0 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #undef REFERENCE #endif #include -#include +#include #include #include #include @@ -477,7 +477,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt:: for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ ) { const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i); - + if( rPageWindow.GetControlContainer( false ) == xCC ) { pImpl->addWindow(rPageWindow); @@ -517,15 +517,15 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { BOOL bDone = FALSE; const KeyCode& rKeyCode = rKEvt.GetKeyCode(); - if ( IsDesignMode() + if ( IsDesignMode() && rKeyCode.GetCode() == KEY_RETURN ) { // RETURN alone enters grid controls, for keyboard accessibility - if ( pWin - && !rKeyCode.IsShift() - && !rKeyCode.IsMod1() - && !rKeyCode.IsMod2() + if ( pWin + && !rKeyCode.IsShift() + && !rKeyCode.IsMod1() + && !rKeyCode.IsMod2() ) { FmFormObj* pObj = getMarkedGrid(); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 4f088e4263..6246263a8b 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ #include #include #include -#include +#include #include #include #include @@ -1006,7 +1006,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) // it is valid that the form shell's forms collection is not initialized, yet pShellImpl->UpdateForms( sal_True ); - + m_xLastCreatedControlModel.set( _rFormObject.GetUnoControlModel(), UNO_QUERY ); if ( !m_xLastCreatedControlModel.is() ) return; diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 4260aec4b8..68b7859d64 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include "gallery.hrc" @@ -52,7 +52,7 @@ class GallerySplitter : public Splitter protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - + public: GallerySplitter( Window* pParent, const ResId& rResId ); @@ -117,7 +117,7 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW, FreeResource(); SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() ); - + mpBrowser1->SelectTheme( 0 ); mpBrowser1->Show( TRUE ); mpBrowser2->Show( TRUE ); @@ -129,7 +129,7 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW, } // ----------------------------------------------------------------------------- - + GalleryBrowser::~GalleryBrowser() { delete mpBrowser2; @@ -171,12 +171,12 @@ void GalleryBrowser::Resize() Point aSplitPos( mpSplitter->GetPosPixel() ); const Size aSplitSize( mpSplitter->GetOutputSizePixel() ); - mpBrowser1->SetPosSizePixel( Point( nFrameWidth, nFrameWidth ), + mpBrowser1->SetPosSizePixel( Point( nFrameWidth, nFrameWidth ), Size( aSplitPos.X() - nFrameWidth, aNewSize.Height() - nFrameWidth2 ) ); - + mpSplitter->SetPosSizePixel( aSplitPos, Size( aSplitSize.Width(), aNewSize.Height() ) ); mpSplitter->SetDragRectPixel( Rectangle( Point( nFrameWidth2, 0 ), Size( aNewSize.Width() - ( nFrameWidth2 << 1 ) - aSplitSize.Width(), aNewSize.Height() ) ) ); - + mpBrowser2->SetPosSizePixel( Point( aSplitPos.X() + aSplitSize.Width(), nFrameWidth ), Size( aNewSize.Width() - aSplitSize.Width() - aSplitPos.X() - nFrameWidth, aNewSize.Height() - nFrameWidth2 ) ); @@ -204,7 +204,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) else mpBrowser1->mpThemes->GrabFocus(); } - else + else { if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) ) mpBrowser1->maNewTheme.GrabFocus(); diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 4facb96b8a..fccc65cd12 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include "gallery1.hxx" -#include "galtheme.hxx" +#include "galtheme.hxx" #include "galbrws.hxx" #include "gallery.hxx" @@ -51,7 +51,7 @@ static SfxListener aLockListener; Gallery* GalleryExplorer::ImplGetGallery() { static Gallery* pGallery = NULL; - + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if( !pGallery ) @@ -140,10 +140,10 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, aListener ); if( pTheme ) - { + { for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND ); - + pGal->ReleaseTheme( pTheme, aListener ); } } @@ -168,9 +168,9 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect { SfxListener aListener; GalleryTheme* pTheme = pGal->AcquireTheme( pGal->GetThemeName( nThemeId ), aListener ); - + if( pTheme ) - { + { for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) { SgaObject* pObj = pTheme->AcquireObject( i ); @@ -214,7 +214,7 @@ BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, c GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, aListener ); if( pTheme ) - { + { INetURLObject aURL( rURL ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); bRet = pTheme->InsertURL( aURL ); @@ -281,7 +281,7 @@ BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos, { if( pGraphic ) bRet = bRet || pTheme->GetGraphic( nPos, *pGraphic, bProgress ); - + if( pThumb ) bRet = bRet || pTheme->GetThumb( nPos, *pThumb, bProgress ); @@ -349,7 +349,7 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName ) for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) ) nRet++; - + pGal->ReleaseTheme( pTheme, aListener ); } } @@ -394,7 +394,7 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, } } } - + pGal->ReleaseTheme( pTheme, aListener ); } } @@ -453,10 +453,10 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName ) GalleryTheme* pTheme = pGal->AcquireTheme( rThemeName, aLockListener ); if( pTheme ) - { + { pTheme->LockTheme(); bRet = TRUE; - } + } } return bRet; @@ -485,10 +485,10 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName ) if( pTheme ) { const BOOL bReleaseLockedTheme = pTheme->UnlockTheme(); - + // release acquired theme pGal->ReleaseTheme( pTheme, aListener ); - + if( bReleaseLockedTheme ) { // release locked theme diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 4751c8107f..6c9f7d9e71 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include "gallery.hxx" #include "galmisc.hxx" @@ -245,10 +245,10 @@ void Gallery::ImplLoad( const String& rMultiPath ) sal_Bool bIsReadOnlyDir; bMultiPath = ( nTokenCount > 0 ); - + INetURLObject aCurURL(SvtPathOptions().GetConfigPath()); ImplLoadSubDirs( aCurURL, bIsReadOnlyDir ); - + if( !bIsReadOnlyDir ) aUserURL = aCurURL; @@ -259,9 +259,9 @@ void Gallery::ImplLoad( const String& rMultiPath ) for( USHORT i = 0UL; i < nTokenCount; i++ ) { aCurURL = INetURLObject(rMultiPath.GetToken( i, ';' )); - + ImplLoadSubDirs( aCurURL, bIsReadOnlyDir ); - + if( !bIsReadOnlyDir ) aUserURL = aCurURL; } @@ -290,7 +290,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR aProps.getArray()[ 0 ] = OUString::createFromAscii( "Url" ); uno::Reference< sdbc::XResultSet > xResultSet( aCnt.createCursor( aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) ); - + try { // check readonlyness the very hard way @@ -299,14 +299,14 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR aTestURL.Append( aTestFile ); SvStream* pTestStm = ::utl::UcbStreamHelper::CreateStream( aTestURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE ); - + if( pTestStm ) { *pTestStm << 1; - + if( pTestStm->GetError() ) rbDirIsReadOnly = sal_True; - + delete pTestStm; KillFile( aTestURL ); } @@ -332,7 +332,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR while( xResultSet->next() ) { INetURLObject aThmURL( xContentAccess->queryContentIdentifierString() ); - + if(aThmURL.GetExtension().equalsIgnoreAsciiCaseAscii("thm")) { INetURLObject aSdgURL( aThmURL); aSdgURL.SetExtension( OUString::createFromAscii( "sdg" ) ); @@ -341,7 +341,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR const OUString aReadOnlyProp( OUString::createFromAscii( "IsReadOnly" ) ); OUString aTitle; sal_Bool bReadOnly = sal_False; - + try { ::ucbhelper::Content aThmCnt( aThmURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv ); @@ -524,7 +524,7 @@ void Gallery::ImplLoadImports() void Gallery::ImplWriteImportList() { - INetURLObject aURL( GetUserURL() ); + INetURLObject aURL( GetUserURL() ); aURL.Append( ( String( "gallery.sdi", RTL_TEXTENCODING_UTF8 ) ) ); SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC ); @@ -786,15 +786,15 @@ BOOL Gallery::RemoveTheme( const String& rThemeName ) { SfxListener aListener; GalleryTheme* pThm = AcquireTheme( rThemeName, aListener ); - + if( pThm ) { INetURLObject aThmURL( pThm->GetThmURL() ); INetURLObject aSdgURL( pThm->GetSdgURL() ); INetURLObject aSdvURL( pThm->GetSdvURL() ); - + ReleaseTheme( pThm, aListener ); - + KillFile( aThmURL ); KillFile( aSdgURL ); KillFile( aSdvURL ); diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index a4b9cc0d39..9acea83d4a 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include @@ -82,22 +82,22 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) { const Color aWhite( COL_WHITE ); - if( aBmpEx.GetPrefMapMode().GetMapUnit() != MAP_PIXEL && - aBmpEx.GetPrefSize().Width() > 0 && + if( aBmpEx.GetPrefMapMode().GetMapUnit() != MAP_PIXEL && + aBmpEx.GetPrefSize().Width() > 0 && aBmpEx.GetPrefSize().Height() > 0 ) { Size aLogSize( OutputDevice::LogicToLogic( aBmpEx.GetPrefSize(), aBmpEx.GetPrefMapMode(), MAP_100TH_MM ) ); - + if( aLogSize.Width() > 0 && aLogSize.Height() > 0 ) { double fFactorLog = static_cast< double >( aLogSize.Width() ) / aLogSize.Height(); double fFactorPix = static_cast< double >( aBmpSize.Width() ) / aBmpSize.Height(); - + if( fFactorPix > fFactorLog ) aBmpSize.Width() = FRound( aBmpSize.Height() * fFactorLog ); else aBmpSize.Height() = FRound( aBmpSize.Width() / fFactorLog ); - + aBmpEx.SetSizePixel( aBmpSize ); } } @@ -371,7 +371,7 @@ Bitmap SgaObjectSound::GetThumbBmp() const nId = RID_SVXBMP_GALLERY_MEDIA; break; } - + const BitmapEx aBmpEx( GAL_RESID( nId ) ); const Color aTransColor( COL_WHITE ); @@ -416,8 +416,8 @@ SgaObjectAnim::SgaObjectAnim() // ------------------------------------------------------------------------ -SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic, - const INetURLObject& rURL, +SgaObjectAnim::SgaObjectAnim( const Graphic& rGraphic, + const INetURLObject& rURL, const String& ) { aURL = rURL; @@ -492,7 +492,7 @@ SvxGalleryDrawModel::~SvxGalleryDrawModel() // ------------------------------------------------------------------------ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ) -{ +{ SvxGalleryDrawModel aModel; if( aModel.GetModel() ) @@ -556,7 +556,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode MapMode aMap( rModel.GetScaleUnit() ); Rectangle aDrawRectPix( Point( 1, 1 ), Size( aOutSizePix.Width() - 2, aOutSizePix.Height() - 2 ) ); const double fFactor = (double) aObjRect.GetWidth() / aObjRect.GetHeight(); - Fraction aFrac( FRound( fFactor < 1. ? aDrawRectPix.GetWidth() * fFactor : aDrawRectPix.GetWidth() ), + Fraction aFrac( FRound( fFactor < 1. ? aDrawRectPix.GetWidth() * fFactor : aDrawRectPix.GetWidth() ), pOut->LogicToPixel( aObjRect.GetSize(), aMap ).Width() ); aMap.SetScaleX( aFrac ); @@ -568,7 +568,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode aOrigin.X() += ( ( aDrawSize.Width() - aObjRect.GetWidth() ) >> 1 ) - aObjRect.Left(); aOrigin.Y() += ( ( aDrawSize.Height() - aObjRect.GetHeight() ) >> 1 ) - aObjRect.Top(); aMap.SetOrigin( aOrigin ); - + aView.SetPageVisible( FALSE ); aView.SetBordVisible( FALSE ); aView.SetGridVisible( FALSE ); diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx index 41eebdbbbb..8b6b11eaba 100644 --- a/svx/source/options/optlingu.cxx +++ b/svx/source/options/optlingu.cxx @@ -45,7 +45,7 @@ #include #include //#include -#include +#include #include #include #include @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index b01caa73f8..a9019ed200 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include "fontitem.hxx" @@ -69,7 +69,7 @@ #include #include #include -#include //add CHINA001 +#include //add CHINA001 #include #include #include @@ -238,7 +238,7 @@ BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj) if (pObj) { //#i80528# The old mechanism is completely useless, only taking into account if - // in all views the GrafDraft feature is used. This will nearly never have been the + // in all views the GrafDraft feature is used. This will nearly never have been the // case since no one ever used this option. // // A much better (and working) criteria would be the VOC contact count. @@ -870,41 +870,41 @@ void SvdProgressInfo::ReportError() namespace { bool impGetSdrObjListFillColor( - const SdrObjList& rList, - const Point& rPnt, - const SdrPageView& rTextEditPV, - const SetOfByte& rVisLayers, + const SdrObjList& rList, + const Point& rPnt, + const SdrPageView& rTextEditPV, + const SetOfByte& rVisLayers, Color& rCol) { - if(!rList.GetModel()) + if(!rList.GetModel()) return false; bool bRet(false); bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false); - for(ULONG no(rList.GetObjCount()); !bRet && no > 0; ) + for(ULONG no(rList.GetObjCount()); !bRet && no > 0; ) { no--; SdrObject* pObj = rList.GetObj(no); SdrObjList* pOL = pObj->GetSubList(); - if(pOL) - { + if(pOL) + { // group object bRet = impGetSdrObjListFillColor(*pOL, rPnt, rTextEditPV, rVisLayers, rCol); - } - else + } + else { SdrTextObj* pText = dynamic_cast< SdrTextObj * >(pObj); // #108867# Exclude zero master page object (i.e. background shape) from color query if(pText - && pObj->IsClosedObj() + && pObj->IsClosedObj() && (!bMaster || (!pObj->IsNotVisibleAsMaster() && 0 != no)) - && pObj->GetCurrentBoundRect().IsInside(rPnt) - && !pText->IsHideContour() + && pObj->GetCurrentBoundRect().IsInside(rPnt) + && !pText->IsHideContour() && SdrObjectPrimitiveHit(*pObj, rPnt, 0, rTextEditPV, &rVisLayers, false)) - { + { bRet = GetDraftFillColor(pObj->GetMergedItemSet(), rCol); } } @@ -914,14 +914,14 @@ namespace } bool impGetSdrPageFillColor( - const SdrPage& rPage, - const Point& rPnt, - const SdrPageView& rTextEditPV, - const SetOfByte& rVisLayers, - Color& rCol, + const SdrPage& rPage, + const Point& rPnt, + const SdrPageView& rTextEditPV, + const SetOfByte& rVisLayers, + Color& rCol, bool bSkipBackgroundShape) { - if(!rPage.GetModel()) + if(!rPage.GetModel()) return false; bool bRet(impGetSdrObjListFillColor(rPage, rPnt, rTextEditPV, rVisLayers, rCol)); @@ -933,7 +933,7 @@ namespace SetOfByte aSet(rVisLayers); aSet &= rPage.TRG_GetMasterPageVisibleLayers(); SdrPage& rMasterPage = rPage.TRG_GetMasterPage(); - + // #108867# Don't fall back to background shape on // master pages. This is later handled by // GetBackgroundColor, and is necessary to cater for @@ -955,8 +955,8 @@ namespace } Color impCalcBackgroundColor( - const Rectangle& rArea, - const SdrPageView& rTextEditPV, + const Rectangle& rArea, + const SdrPageView& rTextEditPV, const SdrPage& rPage) { svtools::ColorConfig aColorConfig; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 94494aa3aa..7d522a9e01 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include #ifndef _VCL_MNEMONIC_HXX_ #include #endif @@ -848,7 +848,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, if ( pDocSh ) if ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable(); - + if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); @@ -1894,7 +1894,7 @@ throw ( Exception, RuntimeException) } // XComponent -void SAL_CALL SvxStyleToolBoxControl::dispose() +void SAL_CALL SvxStyleToolBoxControl::dispose() throw (::com::sun::star::uno::RuntimeException) { SfxToolBoxControl::dispose(); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 783272ebd8..3e2864dc73 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,8 +47,8 @@ // header for define RET_OK #include // header for class SvtLinguConfigItem -#include -#include +#include +#include // header for class IntlWrapper #include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX @@ -77,7 +77,7 @@ using namespace ::com::sun::star::uno; DictionaryList::DictionaryList( Window* pParent, const ResId& rResId) : SvHeaderTabListBox( pParent, rResId ) - , m_xDictionary(0) + , m_xDictionary(0) , m_pHeaderBar(0) , m_pPropertyTypeNameListBox(0) , m_aToBeDeleted() @@ -140,7 +140,7 @@ void DictionaryList::save() sal_Int32 nN; DictionaryEntry* pE; - + for( nN = m_aToBeDeleted.size(); nN--; ) { pE = m_aToBeDeleted[nN]; @@ -186,12 +186,12 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) if(!m_xDictionary.is()) return; - + Sequence< rtl::OUString > aLeftList( m_xDictionary->getConversionEntries( linguistic2::ConversionDirection_FROM_LEFT ) ); sal_Int32 nCount = aLeftList.getLength(); Reference< linguistic2::XConversionPropertyType > xPropertyType( m_xDictionary, uno::UNO_QUERY ); - + rtl::OUString aLeft, aRight; sal_Int16 nConversionPropertyType; @@ -201,7 +201,7 @@ void DictionaryList::refillFromDictionary( sal_Int32 nTextConversionOptions ) Sequence< rtl::OUString > aRightList( m_xDictionary->getConversions( aLeft, 0, aLeft.getLength() , linguistic2::ConversionDirection_FROM_LEFT, nTextConversionOptions ) ); - + if(aRightList.getLength()!=1) { OSL_ASSERT("The Chinese Translation Dictionary should have exactly one Mapping for each term."); @@ -339,7 +339,7 @@ HeaderBar* DictionaryList::createHeaderBar( const String& rColumn1, const String HeaderBarItemBits nBits = HEADER_BAR_BITS; pHeaderBar->InsertItem( 1, rColumn1, nWidth1, nBits | HIB_UPARROW ); pHeaderBar->InsertItem( 2, rColumn2, nWidth2, nBits ); - pHeaderBar->InsertItem( 3, rColumn3, nWidth3, nBits ); + pHeaderBar->InsertItem( 3, rColumn3, nWidth3, nBits ); pHeaderBar->Show(); return pHeaderBar; @@ -352,7 +352,7 @@ void DictionaryList::Resize() if ( !aBoxSize.Width() ) return; - + Size aBarSize = m_pHeaderBar->GetSizePixel(); aBarSize.Width() = GetSizePixel().Width(); m_pHeaderBar->SetSizePixel( aBarSize ); @@ -500,7 +500,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ); m_aCB_Reverse.SetHelpId( HID_SVX_CHINESE_DICTIONARY_CB_REVERSE ); - + m_aCT_DictionaryToSimplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED ); m_aCT_DictionaryToTraditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL ); @@ -512,7 +512,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_aLB_Property.SetDropDownLineCount( m_aLB_Property.GetEntryCount() ); m_aLB_Property.SelectEntryPos(0); - + Reference< linguistic2::XConversionDictionary > xDictionary_To_Simplified(0); Reference< linguistic2::XConversionDictionary > xDictionary_To_Traditional(0); //get dictionaries @@ -538,7 +538,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) rtl::OUString aNameTo_Traditional( rtl::OUString::createFromAscii("ChineseS2T") ); lang::Locale aLocale; aLocale.Language = rtl::OUString::createFromAscii("zh"); - + if( xContainer->hasByName( aNameTo_Simplified ) ) xDictionary_To_Simplified = Reference< linguistic2::XConversionDictionary >( xContainer->getByName( aNameTo_Simplified ), UNO_QUERY ); @@ -567,7 +567,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) } if (xDictionary_To_Traditional.is()) xDictionary_To_Traditional->setActive( sal_True ); - + } catch( uno::Exception& ) { @@ -605,7 +605,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) // updateAfterDirectionChange(); - + //set hdl if(m_pHeaderBar) m_pHeaderBar->SetSelectHdl( LINK( this, ChineseDictionaryDialog, HeaderBarClick ) ); @@ -619,7 +619,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_aCT_DictionaryToSimplified.SetSelectHdl( LINK( this, ChineseDictionaryDialog, MappingSelectHdl )); m_aCT_DictionaryToTraditional.SetSelectHdl( LINK( this, ChineseDictionaryDialog, MappingSelectHdl )); - + m_aPB_Add.SetClickHdl( LINK( this, ChineseDictionaryDialog, AddHdl ) ); m_aPB_Modify.SetClickHdl( LINK( this, ChineseDictionaryDialog, ModifyHdl ) ); m_aPB_Delete.SetClickHdl( LINK( this, ChineseDictionaryDialog, DeleteHdl ) ); @@ -634,7 +634,7 @@ ChineseDictionaryDialog::~ChineseDictionaryDialog() void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirectionToSimplified, sal_Int32 nTextConversionOptions /*i18n::TextConversionOption*/ ) { - if( bDirectionToSimplified == bool(m_aRB_To_Simplified.IsChecked()) + if( bDirectionToSimplified == bool(m_aRB_To_Simplified.IsChecked()) && nTextConversionOptions == m_nTextConversionOptions ) return; @@ -665,7 +665,7 @@ void ChineseDictionaryDialog::updateAfterDirectionChange() } else { - m_aCT_DictionaryToTraditional.activate( m_pHeaderBar ); + m_aCT_DictionaryToTraditional.activate( m_pHeaderBar ); m_aCT_DictionaryToSimplified.Hide(); xDictionary = m_aCT_DictionaryToTraditional.m_xDictionary; } @@ -751,7 +751,7 @@ void ChineseDictionaryDialog::updateButtons() m_aPB_Add.Enable( bAdd ); m_aPB_Delete.Enable( !bAdd && getActiveDictionary().GetSelectedRowCount()>0 ); - + // DictionaryEntry* pFirstSelectedEntry = getActiveDictionary().getFirstSelectedEntry(); bool bModify = false; @@ -791,13 +791,13 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG ) DictionaryList& rActive = getActiveDictionary(); DictionaryList& rReverse = getReverseDictionary(); - + DictionaryEntry* pE = rActive.getFirstSelectedEntry(); if( pE->m_aTerm != aTerm ) return 0; if( pE ) - { + { if( pE->m_aMapping != aMapping || pE->m_nConversionPropertyType != nConversionPropertyType ) { if( m_aCB_Reverse.IsChecked() ) @@ -852,7 +852,7 @@ short ChineseDictionaryDialog::Execute() sal_Int32 nTextConversionOptions = m_nTextConversionOptions; if(m_nTextConversionOptions | i18n::TextConversionOption::USE_CHARACTER_VARIANTS ) nTextConversionOptions = nTextConversionOptions^i18n::TextConversionOption::USE_CHARACTER_VARIANTS ; - + m_aCT_DictionaryToSimplified.refillFromDictionary( nTextConversionOptions ); m_aCT_DictionaryToTraditional.refillFromDictionary( m_nTextConversionOptions ); @@ -890,7 +890,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG ) m_pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HIB_DOWNARROW ); else m_pHeaderBar->SetItemBits( nId, HEADER_BAR_BITS | HIB_UPARROW ); - + //sort lists nBits = m_pHeaderBar->GetItemBits(nId); bool bSortAtoZ = nBits & HIB_UPARROW; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 85cb9a9676..a6263978d1 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ // header for define RET_OK #include // header for class SvtLinguConfigItem -#include -#include +#include +#include #ifndef _SVX_HELPID_HRC #include "helpid.hrc" #endif @@ -103,7 +103,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) aAny = aLngCfg.GetProperty( rtl::OUString::createFromAscii( UPN_IS_TRANSLATE_COMMON_TERMS ) ); if( aAny >>= bValue ) m_aCB_Translate_Commonterms.Check( bValue ); - + m_aPB_Editterms.SetClickHdl( LINK( this, ChineseTranslationDialog, DictionaryHdl ) ); m_aRB_To_Simplified.SetClickHdl( LINK( this, ChineseTranslationDialog, DirectionHdl ) ); m_aRB_To_Traditional.SetClickHdl( LINK( this, ChineseTranslationDialog, DirectionHdl ) ); @@ -191,7 +191,7 @@ IMPL_LINK( ChineseTranslationDialog, DictionaryHdl, void*, EMPTYARG ) nTextConversionOptions = nTextConversionOptions | i18n::TextConversionOption::CHARACTER_BY_CHARACTER; if( m_aCB_Use_Variants.IsChecked() ) nTextConversionOptions = nTextConversionOptions | i18n::TextConversionOption::USE_CHARACTER_VARIANTS; - + m_pDictionaryDialog->setDirectionAndTextConversionOptions( m_aRB_To_Simplified.IsChecked(), nTextConversionOptions ); m_pDictionaryDialog->Execute(); } diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 671d28e431..1eef2212d1 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include #include @@ -286,12 +286,12 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() ); #endif writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() ); - writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); + writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); // XPrimitiveFactory2D - writeInfo( pKey, - drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), - drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); + writeInfo( pKey, + drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), + drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() ); writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() ); diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index ef7646c944..438ce8ef46 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,19 +32,19 @@ #include "precompiled_svx.hxx" #include - -#include "unogaltheme.hxx" -#include "unogalitem.hxx" -#include "galtheme.hxx" -#include "gallery1.hxx" -#include "galmisc.hxx" -#include + +#include "unogaltheme.hxx" +#include "unogalitem.hxx" +#include "galtheme.hxx" +#include "gallery1.hxx" +#include "galmisc.hxx" +#include #include #include -#ifndef _SV_SVAPP_HXX_ +#ifndef _SV_SVAPP_HXX_ #include #endif -#include +#include using namespace ::com::sun::star; @@ -58,7 +58,7 @@ GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName ) { mpGallery = ::Gallery::GetGalleryInstance(); mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : NULL ); - + if( mpGallery ) StartListening( *mpGallery ); } @@ -68,7 +68,7 @@ GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName ) GalleryTheme::~GalleryTheme() { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" ); implReleaseItems( NULL ); @@ -76,14 +76,14 @@ GalleryTheme::~GalleryTheme() if( mpGallery ) { EndListening( *mpGallery ); - + if( mpTheme ) mpGallery->ReleaseTheme( mpTheme, *this ); } } // ------------------------------------------------------------------------------ - + ::rtl::OUString GalleryTheme::getImplementationName_Static() throw() { @@ -96,15 +96,15 @@ uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() throw() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - + aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryTheme" ) ); - + return aSeq; } // ------------------------------------------------------------------------------ - -::rtl::OUString SAL_CALL GalleryTheme::getImplementationName() + +::rtl::OUString SAL_CALL GalleryTheme::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -112,7 +112,7 @@ uno::Sequence< ::rtl::OUString > GalleryTheme::getSupportedServiceNames_Static() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); @@ -127,7 +127,7 @@ sal_Bool SAL_CALL GalleryTheme::supportsService( const ::rtl::OUString& ServiceN // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() +uno::Sequence< ::rtl::OUString > SAL_CALL GalleryTheme::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -135,7 +135,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryTheme::getSupportedServiceNames // ------------------------------------------------------------------------------ -uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() +uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() throw(uno::RuntimeException) { uno::Sequence< uno::Type > aTypes( 5 ); @@ -152,18 +152,18 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes() // ------------------------------------------------------------------------------ -uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() +uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId() throw(uno::RuntimeException) { const vos::OGuard aGuard( Application::GetSolarMutex() ); static uno::Sequence< sal_Int8 > aId; - + if( aId.getLength() == 0 ) { aId.realloc( 16 ); rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); } - + return aId; } @@ -177,21 +177,21 @@ uno::Type SAL_CALL GalleryTheme::getElementType() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryTheme::hasElements() +sal_Bool SAL_CALL GalleryTheme::hasElements() throw (uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + return( ( mpTheme != NULL ) && ( mpTheme->GetObjectCount() > 0 ) ); } // ------------------------------------------------------------------------------ -sal_Int32 SAL_CALL GalleryTheme::getCount() +sal_Int32 SAL_CALL GalleryTheme::getCount() throw (uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + return( mpTheme ? mpTheme->GetObjectCount() : 0 ); } @@ -202,7 +202,7 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); uno::Any aRet; - + if( mpTheme ) { if( ( nIndex < 0 ) || ( nIndex >= getCount() ) ) @@ -212,12 +212,12 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) else { const GalleryObject* pObj = mpTheme->ImplGetGalleryObject( nIndex ); - + if( pObj ) - aRet = uno::makeAny( uno::Reference< gallery::XGalleryItem >( new GalleryItem( *this, *pObj ) ) ); + aRet = uno::makeAny( uno::Reference< gallery::XGalleryItem >( new GalleryItem( *this, *pObj ) ) ); } } - + return aRet; } @@ -228,20 +228,20 @@ uno::Any SAL_CALL GalleryTheme::getByIndex( ::sal_Int32 nIndex ) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); ::rtl::OUString aRet; - + if( mpTheme ) aRet = mpTheme->GetName(); - + return aRet; } // ------------------------------------------------------------------------------ - + void SAL_CALL GalleryTheme::update( ) throw (uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + if( mpTheme ) { const Link aDummyLink; @@ -250,26 +250,26 @@ void SAL_CALL GalleryTheme::update( ) } // ------------------------------------------------------------------------------ - + ::sal_Int32 SAL_CALL GalleryTheme::insertURLByIndex( const ::rtl::OUString& rURL, ::sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); sal_Int32 nRet = -1; - + if( mpTheme ) { try { const INetURLObject aURL( rURL ); - + nIndex = ::std::max( ::std::min( nIndex, getCount() ), sal_Int32( 0 ) ); - + if( ( aURL.GetProtocol() != INET_PROT_NOT_VALID ) && mpTheme->InsertURL( aURL, nIndex ) ) { const GalleryObject* pObj = mpTheme->ImplGetGalleryObject( aURL ); - + if( pObj ) nRet = mpTheme->ImplGetGalleryObjectPos( pObj ); } @@ -278,14 +278,14 @@ void SAL_CALL GalleryTheme::update( ) { } } - + return nRet; } // ------------------------------------------------------------------------------ - -::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex( - const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) + +::sal_Int32 SAL_CALL GalleryTheme::insertGraphicByIndex( + const uno::Reference< graphic::XGraphic >& rxGraphic, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); @@ -296,9 +296,9 @@ void SAL_CALL GalleryTheme::update( ) try { const Graphic aGraphic( rxGraphic ); - + nIndex = ::std::max( ::std::min( nIndex, getCount() ), sal_Int32( 0 ) ); - + if( mpTheme->InsertGraphic( aGraphic, nIndex ) ) nRet = nIndex; } @@ -306,12 +306,12 @@ void SAL_CALL GalleryTheme::update( ) { } } - + return nRet; } // ------------------------------------------------------------------------------ - + ::sal_Int32 SAL_CALL GalleryTheme::insertDrawingByIndex( const uno::Reference< lang::XComponent >& Drawing, sal_Int32 nIndex ) throw (lang::WrappedTargetException, uno::RuntimeException) @@ -322,26 +322,26 @@ void SAL_CALL GalleryTheme::update( ) if( mpTheme ) { GalleryDrawingModel* pModel = GalleryDrawingModel::getImplementation( Drawing ); - + if( pModel && pModel->GetDoc() && pModel->GetDoc()->ISA( FmFormModel ) ) { nIndex = ::std::max( ::std::min( nIndex, getCount() ), sal_Int32( 0 ) ); - + if( mpTheme->InsertModel( *static_cast< FmFormModel* >( pModel->GetDoc() ), nIndex ) ) nRet = nIndex; } } - + return nRet; } // ------------------------------------------------------------------------------ - + void SAL_CALL GalleryTheme::removeByIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + if( mpTheme ) { if( ( nIndex < 0 ) || ( nIndex >= getCount() ) ) @@ -363,9 +363,9 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) case( GALLERY_HINT_CLOSE_THEME ): { DBG_ASSERT( !mpTheme || mpGallery, "Theme is living without Gallery" ); - + implReleaseItems( NULL ); - + if( mpGallery && mpTheme ) { mpGallery->ReleaseTheme( mpTheme, *this ); @@ -373,16 +373,16 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } break; - + case( GALLERY_HINT_CLOSE_OBJECT ): { GalleryObject* pObj = reinterpret_cast< GalleryObject* >( rGalleryHint.GetData1() ); - + if( pObj ) implReleaseItems( pObj ); } break; - + default: break; } @@ -393,7 +393,7 @@ void GalleryTheme::Notify( SfxBroadcaster&, const SfxHint& rHint ) void GalleryTheme::implReleaseItems( GalleryObject* pObj ) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + for( GalleryItemList::iterator aIter = maItemList.begin(); aIter != maItemList.end(); ) { if( !pObj || ( (*aIter)->implGetObject() == pObj ) ) @@ -418,17 +418,17 @@ void GalleryTheme::implReleaseItems( GalleryObject* pObj ) void GalleryTheme::implRegisterGalleryItem( ::unogallery::GalleryItem& rItem ) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + // DBG_ASSERT( maItemList.find( &rItem ) == maItemList.end(), "Item already registered" ); maItemList.push_back( &rItem ); } // ------------------------------------------------------------------------------ - + void GalleryTheme::implDeregisterGalleryItem( ::unogallery::GalleryItem& rItem ) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + // DBG_ASSERT( maItemList.find( &rItem ) != maItemList.end(), "Item is not registered" ); maItemList.remove( &rItem ); } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index f96d569b75..261fa960ea 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,15 +31,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "unogalthemeprovider.hxx" -#include "unogaltheme.hxx" -#include "gallery1.hxx" +#include "unogalthemeprovider.hxx" +#include "unogaltheme.hxx" +#include "gallery1.hxx" #include #include -#ifndef _SV_SVAPP_HXX_ +#ifndef _SV_SVAPP_HXX_ #include #endif -#include +#include #include #include @@ -52,7 +52,7 @@ namespace unogallery { // -------------------- uno::Reference< uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & ) + const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) { return *( new GalleryThemeProvider() ); @@ -60,7 +60,7 @@ uno::Reference< uno::XInterface > SAL_CALL GalleryThemeProvider_createInstance( // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() +uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServiceNames() throw() { return GalleryThemeProvider::getSupportedServiceNames_Static(); @@ -68,7 +68,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServi // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() +::rtl::OUString SAL_CALL GalleryThemeProvider_getImplementationName() throw() { return GalleryThemeProvider::getImplementationName_Static(); @@ -91,7 +91,7 @@ GalleryThemeProvider::~GalleryThemeProvider() } // ------------------------------------------------------------------------------ - + SVX_DLLPUBLIC ::rtl::OUString GalleryThemeProvider::getImplementationName_Static() throw() { @@ -104,15 +104,15 @@ SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupporte throw() { uno::Sequence< ::rtl::OUString > aSeq( 1 ); - + aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.gallery.GalleryThemeProvider" ) ); - + return aSeq; } // ------------------------------------------------------------------------------ - -::rtl::OUString SAL_CALL GalleryThemeProvider::getImplementationName() + +::rtl::OUString SAL_CALL GalleryThemeProvider::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -120,7 +120,7 @@ SVX_DLLPUBLIC uno::Sequence< ::rtl::OUString > GalleryThemeProvider::getSupporte // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); @@ -135,7 +135,7 @@ sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const ::rtl::OUString& // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() +uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -143,7 +143,7 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getSupportedServ // ------------------------------------------------------------------------------ -uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() +uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() throw(uno::RuntimeException) { uno::Sequence< uno::Type > aTypes( 6 ); @@ -161,18 +161,18 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes() // ------------------------------------------------------------------------------ -uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId() +uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId() throw(uno::RuntimeException) { const vos::OGuard aGuard( Application::GetSolarMutex() ); static uno::Sequence< sal_Int8 > aId; - + if( aId.getLength() == 0 ) { aId.realloc( 16 ); rtl_createUuid( reinterpret_cast< sal_uInt8* >( aId.getArray() ), 0, sal_True ); } - + return aId; } @@ -189,11 +189,11 @@ void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& if( rArguments[ i ] >>= aParams ) break; } - + for( i = 0; i < aParams.getLength(); ++i ) { const beans::PropertyValue& rProp = aParams[ i ]; - + if( rProp.Name.equalsAscii( "ProvideHiddenThemes" ) ) rProp.Value >>= mbHiddenThemes; } @@ -209,22 +209,22 @@ uno::Type SAL_CALL GalleryThemeProvider::getElementType() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GalleryThemeProvider::hasElements() +sal_Bool SAL_CALL GalleryThemeProvider::hasElements() throw (uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + return( ( mpGallery != NULL ) && ( mpGallery->GetThemeCount() > 0 ) ); } // ------------------------------------------------------------------------------ - + uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName ) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); uno::Any aRet; - + if( !mpGallery || !mpGallery->HasTheme( rName ) ) { throw container::NoSuchElementException(); @@ -233,7 +233,7 @@ uno::Any SAL_CALL GalleryThemeProvider::getByName( const ::rtl::OUString& rName { aRet = uno::makeAny( uno::Reference< gallery::XGalleryTheme >( new ::unogallery::GalleryTheme( rName ) ) ); } - + return aRet; } @@ -245,17 +245,17 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider::getElementNames( const ::vos::OGuard aGuard( Application::GetSolarMutex() ); sal_uInt32 i = 0, nCount = ( mpGallery ? mpGallery->GetThemeCount() : 0 ), nRealCount = 0; uno::Sequence< ::rtl::OUString > aSeq( nCount ); - + for( ; i < nCount; ++i ) { const GalleryThemeEntry* pEntry = mpGallery->GetThemeInfo( i ); - + if( mbHiddenThemes || !pEntry->IsHidden() ) aSeq[ nRealCount++ ] = pEntry->GetThemeName(); } - + aSeq.realloc( nRealCount ); - + return aSeq; } @@ -265,9 +265,9 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName throw (uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - + sal_Bool bRet = sal_False; - + if( mpGallery && mpGallery->HasTheme( rName ) ) bRet = ( mbHiddenThemes || !mpGallery->GetThemeInfo( rName )->IsHidden() ); @@ -276,12 +276,12 @@ sal_Bool SAL_CALL GalleryThemeProvider::hasByName( const ::rtl::OUString& rName // ------------------------------------------------------------------------------ -uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const ::rtl::OUString& rThemeName ) +uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNewByName( const ::rtl::OUString& rThemeName ) throw (container::ElementExistException, uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); uno::Reference< gallery::XGalleryTheme > xRet; - + if( mpGallery ) { if( mpGallery->HasTheme( rThemeName ) ) @@ -293,19 +293,19 @@ uno::Reference< gallery::XGalleryTheme > SAL_CALL GalleryThemeProvider::insertNe xRet = new ::unogallery::GalleryTheme( rThemeName ); } } - + return xRet; } // ------------------------------------------------------------------------------ -void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName ) +void SAL_CALL GalleryThemeProvider::removeByName( const ::rtl::OUString& rName ) throw (container::NoSuchElementException, uno::RuntimeException) { const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - - if( !mpGallery || - !mpGallery->HasTheme( rName ) || + + if( !mpGallery || + !mpGallery->HasTheme( rName ) || ( !mbHiddenThemes && mpGallery->GetThemeInfo( rName )->IsHidden() ) ) { throw container::NoSuchElementException(); diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 06543d2e82..911f9fd22c 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ #include "XPropertyTable.hxx" #include -#include +#include #include "xmlxtexp.hxx" #include "xmlxtimp.hxx" diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index bce3f96a0c..ac4fff4641 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include #include -#include +#include #include namespace com { diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 06ddd7bb63..907f3682fe 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -438,7 +438,7 @@ #include "svtools/cntnrsrt.hxx" #include "svtools/itemset.hxx" -#include "svtools/moduleoptions.hxx" +#include "unotools/moduleoptions.hxx" #include "svtools/nfsymbol.hxx" #include "svtools/numuno.hxx" #include "svtools/poolitem.hxx" diff --git a/xmloff/inc/xmloff/maptype.hxx b/xmloff/inc/xmloff/maptype.hxx index 2e756692ff..305d9fabfc 100644 --- a/xmloff/inc/xmloff/maptype.hxx +++ b/xmloff/inc/xmloff/maptype.hxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ #include #include #include -#include +#include /////////////////////////////////////////////////////////////////////////// // diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 8f487b8556..635bb36d02 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -68,7 +68,7 @@ #include #include -#include +#include #include #include @@ -87,7 +87,7 @@ class XMLImageMapExport; class XMLErrors; // --> OD 2006-03-14 #i51726# -#include +#include // <-- namespace rtl { class OUString; } diff --git a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx index 71652e4a7f..cc67c4ac75 100644 --- a/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx +++ b/xmloff/source/chart/XMLErrorBarStylePropertyHdl.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include "XMLErrorBarStylePropertyHdl.hxx" -#include +#include #include #include @@ -42,7 +42,7 @@ using namespace com::sun::star; XMLErrorBarStylePropertyHdl::XMLErrorBarStylePropertyHdl( const SvXMLEnumMapEntry* pEnumMap, const ::com::sun::star::uno::Type & rType ) : XMLEnumPropertyHdl( pEnumMap, rType ) { -} +} XMLErrorBarStylePropertyHdl::~XMLErrorBarStylePropertyHdl() { -- cgit v1.2.3 From dabf9345bef57a917dc8f5bc3664b488cf2d727f Mon Sep 17 00:00:00 2001 From: os Date: Mon, 12 Oct 2009 10:27:34 +0200 Subject: #i105687# enable number format for custom date/datetime/time data --- sfx2/inc/sfx2/dinfdlg.hxx | 4 ++++ sfx2/source/dialog/dinfdlg.cxx | 22 ++++++++++++++++++++-- xmloff/inc/txtfldi.hxx | 5 +++++ xmloff/source/text/txtflde.cxx | 11 +++++++++-- xmloff/source/text/txtfldi.cxx | 33 ++++++++++++++++++++++++++++++++- 5 files changed, 70 insertions(+), 5 deletions(-) (limited to 'xmloff/inc') diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index 65f1f6a900..e0cdd56788 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -424,6 +424,10 @@ struct CustomPropertyLine CustomPropertiesYesNoButton m_aYesNoButton; CustomPropertiesRemoveButton m_aRemoveButton; + Point m_aDatePos; + Point m_aTimePos; + Size m_aDateTimeSize; + bool m_bIsRemoved; bool m_bTypeLostFocus; diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index dae8fc4964..3379027e98 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1656,6 +1656,21 @@ IMPL_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox*, pBox ) pLine->m_aDateField.Show( (CUSTOM_TYPE_DATE == nType) || (CUSTOM_TYPE_DATETIME == nType) ); pLine->m_aTimeField.Show( (CUSTOM_TYPE_TIME == nType) || (CUSTOM_TYPE_DATETIME == nType) ); pLine->m_aYesNoButton.Show( CUSTOM_TYPE_BOOLEAN == nType ); + //adjust positions of date and time controls + if( nType == CUSTOM_TYPE_DATE ) + { + pLine->m_aDateField.SetPosSizePixel(pLine->m_aValueEdit.GetPosPixel(), pLine->m_aValueEdit.GetSizePixel()); + } + else if( nType == CUSTOM_TYPE_DATETIME) + { + pLine->m_aDateField.SetPosSizePixel( pLine->m_aDatePos, pLine->m_aDateTimeSize ); + pLine->m_aTimeField.SetPosSizePixel(pLine->m_aTimePos, pLine->m_aDateTimeSize ); + } + else if( nType == CUSTOM_TYPE_TIME) + { + pLine->m_aTimeField.SetPosSizePixel(pLine->m_aValueEdit.GetPosPixel(), pLine->m_aValueEdit.GetSizePixel()); + } + return 0; } @@ -1881,6 +1896,10 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) pCurrent++; pNewCurrent++; } + // + pNewLine->m_aDatePos = pNewLine->m_aDateField.GetPosPixel(); + pNewLine->m_aTimePos = pNewLine->m_aTimeField.GetPosPixel(); + pNewLine->m_aDateTimeSize = pNewLine->m_aDateField.GetSizePixel(); double nTmpValue = 0; bool bTmpValue = false; @@ -1898,6 +1917,7 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) { sal_uInt32 nIndex = m_aNumberFormatter.GetFormatIndex( NF_NUMBER_SYSTEM ); m_aNumberFormatter.GetInputLineString( nTmpValue, nIndex, sValue ); + pNewLine->m_aValueEdit.SetText( sValue ); nType = CUSTOM_TYPE_NUMBER; } else if ( rAny >>= bTmpValue ) @@ -1939,8 +1959,6 @@ void CustomPropertiesWindow::AddLine( const ::rtl::OUString& sName, Any& rAny ) else pNewLine->m_aYesNoButton.CheckNo(); } -// else -// pNewLine->m_aValueEdit.SetText( sValue ); pNewLine->m_aTypeBox.SelectEntryPos( m_aTypeBox.GetEntryPos( (void*)nType ) ); } diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 4ced397688..c014b694c6 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -745,6 +745,11 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext { rtl::OUString aName; const ::rtl::OUString sPropertyName; + const ::rtl::OUString sPropertyNumberFormat; + const ::rtl::OUString sPropertyIsFixedLanguage; + sal_Int32 nFormat; + sal_Bool bFormatOK; + sal_Bool bIsDefaultLanguage; public: diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 3cc372f171..e17041266b 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -681,6 +681,7 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_PAGENUMBER: case FIELD_ID_REFPAGE_SET: case FIELD_ID_REFPAGE_GET: + case FIELD_ID_DOCINFO_CUSTOM: // always number return sal_False; @@ -701,7 +702,6 @@ sal_Bool XMLTextFieldExport::IsStringField( case FIELD_ID_HIDDEN_PARAGRAPH: case FIELD_ID_DOCINFO_CREATION_AUTHOR: case FIELD_ID_DOCINFO_DESCRIPTION: - case FIELD_ID_DOCINFO_CUSTOM: case FIELD_ID_DOCINFO_PRINT_AUTHOR: case FIELD_ID_DOCINFO_TITLE: case FIELD_ID_DOCINFO_SUBJECT: @@ -850,6 +850,7 @@ void XMLTextFieldExport::ExportFieldAutoStyle( case FIELD_ID_USER_GET: case FIELD_ID_EXPRESSION: case FIELD_ID_TABLE_FORMULA: + case FIELD_ID_DOCINFO_CUSTOM: // register number format, if this is a numeric field if (! IsStringField(nToken, xPropSet)) { @@ -913,7 +914,6 @@ void XMLTextFieldExport::ExportFieldAutoStyle( case FIELD_ID_HIDDEN_PARAGRAPH: case FIELD_ID_DOCINFO_CREATION_AUTHOR: case FIELD_ID_DOCINFO_DESCRIPTION: - case FIELD_ID_DOCINFO_CUSTOM: case FIELD_ID_DOCINFO_PRINT_AUTHOR: case FIELD_ID_DOCINFO_TITLE: case FIELD_ID_DOCINFO_SUBJECT: @@ -1473,6 +1473,13 @@ void XMLTextFieldExport::ExportFieldHelper( case FIELD_ID_DOCINFO_CUSTOM: { + ProcessValueAndType(sal_False, // doesn't happen for text + GetIntProperty(sPropertyNumberFormat,rPropSet), + sEmpty, sEmpty, 0.0, // not used + sal_False, sal_False, sal_True, + ! GetOptionalBoolProperty( + sPropertyIsFixedLanguage, + rPropSet, xPropSetInfo, sal_False )); uno::Any aAny = rPropSet->getPropertyValue( sPropertyName ); ::rtl::OUString sName; aAny >>= sName; diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 3b8b551b92..d47e813c34 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -2048,6 +2048,11 @@ XMLUserDocInfoImportContext::XMLUserDocInfoImportContext( sLocalName, nToken, sal_False, sal_False) , sPropertyName(RTL_CONSTASCII_USTRINGPARAM(sAPI_name)) + , sPropertyNumberFormat(RTL_CONSTASCII_USTRINGPARAM(sAPI_number_format)) + , sPropertyIsFixedLanguage(RTL_CONSTASCII_USTRINGPARAM(sAPI_is_fixed_language)) + , nFormat(0) + , bFormatOK(sal_False) + , bIsDefaultLanguage( sal_True ) { bValid = sal_False; } @@ -2058,6 +2063,17 @@ void XMLUserDocInfoImportContext::ProcessAttribute( { switch (nAttrToken) { + case XML_TOK_TEXTFIELD_DATA_STYLE_NAME: + { + sal_Int32 nKey = GetImportHelper().GetDataStyleKey( + sAttrValue, &bIsDefaultLanguage); + if (-1 != nKey) + { + nFormat = nKey; + bFormatOK = sal_True; + } + break; + } case XML_TOK_TEXTFIELD_NAME: { if (!bValid) @@ -2080,12 +2096,27 @@ void XMLUserDocInfoImportContext::PrepareField( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> & xPropertySet) { + uno::Any aAny; if ( aName.getLength() ) { - uno::Any aAny; aAny <<= aName; xPropertySet->setPropertyValue(sPropertyName, aAny); } + Reference xPropertySetInfo( + xPropertySet->getPropertySetInfo()); + if (bFormatOK && + xPropertySetInfo->hasPropertyByName(sPropertyNumberFormat)) + { + aAny <<= nFormat; + xPropertySet->setPropertyValue(sPropertyNumberFormat, aAny); + + if( xPropertySetInfo->hasPropertyByName( sPropertyIsFixedLanguage ) ) + { + sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage; + aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() ); + xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny ); + } + } // call superclass to handle "fixed" XMLSimpleDocInfoImportContext::PrepareField(xPropertySet); -- cgit v1.2.3 From 5bb7ed58d718d37fa56e592ffdaf01cc9a0410af Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- avmedia/inc/avmedia/mediaitem.hxx | 2 +- avmedia/inc/avmedia/mediatoolbox.hxx | 2 +- avmedia/inc/helpids.hrc | 2 +- avmedia/source/framework/mediacontrol.cxx | 2 +- avmedia/source/framework/mediamisc.cxx | 2 +- avmedia/source/framework/mediaplayer.cxx | 2 +- basic/inc/basic/basmgr.hxx | 2 +- basic/inc/basic/sbdef.hxx | 2 +- basic/inc/basic/sbx.hxx | 6 +- basic/inc/basic/sbxbase.hxx | 2 +- basic/inc/basic/sbxobj.hxx | 2 +- basic/inc/basic/testtool.hxx | 2 +- basic/inc/pch/precompiled_basic.hxx | 26 +++--- basic/inc/sb.hrc | 2 +- basic/source/app/app.cxx | 2 +- basic/source/app/app.hxx | 4 +- basic/source/app/appedit.cxx | 2 +- basic/source/app/dialogs.cxx | 4 +- basic/source/app/msgedit.cxx | 2 +- basic/source/app/textedit.hxx | 2 +- basic/source/basmgr/basicmanagerrepository.cxx | 2 +- basic/source/basmgr/basmgr.cxx | 2 +- basic/source/classes/propacc.cxx | 2 +- basic/source/classes/sbunoobj.cxx | 2 +- basic/source/classes/sbxmod.cxx | 2 +- basic/source/inc/propacc.hxx | 2 +- basic/source/inc/symtbl.hxx | 2 +- basic/source/runtime/basrdll.cxx | 2 +- basic/source/runtime/ddectrl.cxx | 2 +- basic/source/runtime/dllmgr.hxx | 4 +- basic/source/runtime/methods.cxx | 2 +- basic/source/runtime/methods1.cxx | 2 +- basic/source/runtime/runtime.cxx | 4 +- basic/source/sbx/format.src | 2 +- basic/source/sbx/sbxdate.cxx | 2 +- basic/source/sbx/sbxobj.cxx | 2 +- basic/source/sbx/sbxscan.cxx | 6 +- basic/source/sbx/sbxvar.cxx | 2 +- connectivity/prj/build.lst | 2 +- .../source/commontools/formattedcolumnvalue.cxx | 2 +- connectivity/source/drivers/calc/CTable.cxx | 4 +- connectivity/source/drivers/dbase/DTable.cxx | 6 +- connectivity/source/drivers/evoab/LFolderList.cxx | 6 +- connectivity/source/drivers/evoab/LTable.cxx | 6 +- connectivity/source/drivers/evoab2/NResultSet.cxx | 2 +- connectivity/source/drivers/file/fcode.cxx | 2 +- connectivity/source/drivers/flat/ETable.cxx | 6 +- desktop/source/app/app.cxx | 15 ++-- desktop/source/app/cmdlineargs.cxx | 2 +- desktop/source/app/desktop.hrc | 2 +- desktop/source/app/langselect.hxx | 2 +- desktop/source/app/userinstall.cxx | 4 +- .../deployment/gui/dp_gui_autoscrolledit.cxx | 2 +- .../deployment/gui/dp_gui_autoscrolledit.hxx | 2 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 +- desktop/source/deployment/gui/license_dialog.cxx | 2 +- desktop/source/deployment/manager/dp_manager.cxx | 2 +- .../deployment/registry/component/dp_component.cxx | 2 +- .../registry/configuration/dp_configuration.cxx | 2 +- .../registry/executable/dp_executable.cxx | 2 +- .../source/deployment/registry/help/dp_help.cxx | 2 +- .../deployment/registry/package/dp_package.cxx | 2 +- .../deployment/registry/script/dp_script.cxx | 2 +- .../source/deployment/registry/sfwk/dp_sfwk.cxx | 2 +- desktop/source/inc/helpid.hrc | 2 +- desktop/source/migration/pages.hxx | 2 +- .../source/processor2d/canvasprocessor.cxx | 2 +- drawinglayer/source/processor2d/vclprocessor2d.cxx | 2 +- formula/inc/helpids.hrc | 2 +- formula/source/core/api/FormulaCompiler.cxx | 2 +- formula/source/core/inc/core_resource.hrc | 2 +- formula/source/core/resource/core_resource.cxx | 2 +- formula/source/ui/dlg/FormulaHelper.cxx | 2 +- formula/source/ui/dlg/formula.cxx | 6 +- formula/source/ui/dlg/funcpage.cxx | 4 +- formula/source/ui/dlg/parawin.cxx | 4 +- formula/source/ui/dlg/structpg.cxx | 4 +- formula/source/ui/inc/ForResId.hrc | 2 +- formula/source/ui/resource/ModuleHelper.cxx | 2 +- fpicker/source/aqua/resourceprovider.cxx | 2 +- fpicker/source/generic/fpicker.cxx | 2 +- fpicker/source/office/OfficeFilePicker.cxx | 2 +- fpicker/source/office/OfficeFilePicker.src | 2 +- fpicker/source/office/OfficeFolderPicker.cxx | 2 +- fpicker/source/office/iodlg.cxx | 10 +-- fpicker/source/office/iodlg.hrc | 2 +- fpicker/source/office/iodlg.hxx | 6 +- fpicker/source/office/iodlg.src | 2 +- fpicker/source/office/iodlgimp.cxx | 6 +- fpicker/source/office/iodlgimp.hxx | 2 +- fpicker/source/unx/gnome/resourceprovider.cxx | 2 +- fpicker/source/unx/kde4/KDE4FilePicker.cxx | 2 +- fpicker/source/win32/misc/resourceprovider.cxx | 2 +- framework/inc/classes/protocolhandlercache.hxx | 1 + framework/inc/framework.hrc | 2 +- framework/inc/helper/mischelper.hxx | 2 +- framework/inc/helpid.hrc | 2 +- framework/inc/pch/precompiled_framework.hxx | 14 ++-- framework/inc/services/licensedlg.hxx | 2 +- framework/inc/services/substitutepathvars.hxx | 1 + framework/inc/xml/eventsconfiguration.hxx | 2 +- framework/inc/xml/imagesconfiguration.hxx | 2 +- framework/inc/xml/statusbarconfiguration.hxx | 2 +- framework/inc/xml/toolboxconfiguration.hxx | 2 +- framework/source/classes/protocolhandlercache.cxx | 4 + framework/source/services/autorecovery.cxx | 2 +- framework/source/services/backingcomp.cxx | 4 +- framework/source/services/backingwindow.cxx | 2 +- .../source/services/mediatypedetectionhelper.cxx | 2 +- framework/source/services/substitutepathvars.cxx | 5 ++ .../source/uielement/controlmenucontroller.cxx | 2 +- .../uielement/langselectionmenucontroller.cxx | 2 +- .../uielement/langselectionstatusbarcontroller.cxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 2 +- linguistic/inc/misc.hxx | 1 - linguistic/source/convdic.cxx | 15 ++-- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/convdiclist.hxx | 2 +- linguistic/source/convdicxml.hxx | 2 +- linguistic/source/gciterator.cxx | 6 +- linguistic/source/grammarchecker.cxx | 2 +- linguistic/source/hyphdsp.cxx | 2 +- linguistic/source/hyphdta.cxx | 2 +- linguistic/source/lngopt.cxx | 1 - linguistic/source/lngopt.hxx | 6 +- linguistic/source/lngsvcmgr.cxx | 17 ++-- linguistic/source/lngsvcmgr.hxx | 2 +- linguistic/source/makefile.mk | 12 +-- linguistic/source/misc.cxx | 7 +- linguistic/source/spelldsp.cxx | 2 +- linguistic/source/thesdsp.cxx | 2 +- sfx2/inc/arrdecl.hxx | 2 +- sfx2/inc/minfitem.hxx | 2 +- sfx2/inc/msgnodei.hxx | 4 +- sfx2/inc/orgmgr.hxx | 2 +- sfx2/inc/pch/precompiled_sfx2.hxx | 98 +++++++++++----------- sfx2/inc/sfx2/app.hxx | 6 +- sfx2/inc/sfx2/appuno.hxx | 4 +- sfx2/inc/sfx2/cntids.hrc | 4 +- sfx2/inc/sfx2/ctrlitem.hxx | 2 +- sfx2/inc/sfx2/dinfdlg.hxx | 6 +- sfx2/inc/sfx2/dispatch.hxx | 2 +- sfx2/inc/sfx2/docfile.hxx | 4 +- sfx2/inc/sfx2/event.hxx | 2 +- sfx2/inc/sfx2/evntconf.hxx | 4 +- sfx2/inc/sfx2/fcontnr.hxx | 2 +- sfx2/inc/sfx2/frame.hxx | 4 +- sfx2/inc/sfx2/frmdescr.hxx | 4 +- sfx2/inc/sfx2/itemwrapper.hxx | 8 +- sfx2/inc/sfx2/linkmgr.hxx | 2 +- sfx2/inc/sfx2/macrconf.hxx | 2 +- sfx2/inc/sfx2/macropg.hxx | 2 +- sfx2/inc/sfx2/msgpool.hxx | 2 +- sfx2/inc/sfx2/objitem.hxx | 2 +- sfx2/inc/sfx2/objsh.hxx | 2 +- sfx2/inc/sfx2/objuno.hxx | 2 +- sfx2/inc/sfx2/querystatus.hxx | 2 +- sfx2/inc/sfx2/request.hxx | 4 +- sfx2/inc/sfx2/sfx.hrc | 4 +- sfx2/inc/sfx2/sfxbasemodel.hxx | 2 +- sfx2/inc/sfx2/sfxhtml.hxx | 2 +- sfx2/inc/sfx2/sfxsids.hrc | 2 +- sfx2/inc/sfx2/sfxstatuslistener.hxx | 2 +- sfx2/inc/sfx2/shell.hxx | 2 +- sfx2/inc/sfx2/srchitem.hxx | 3 +- sfx2/inc/sfx2/tabdlg.hxx | 4 +- sfx2/inc/sfx2/viewfrm.hxx | 4 +- sfx2/inc/sfx2/viewsh.hxx | 2 +- sfx2/inc/sorgitm.hxx | 2 +- sfx2/inc/stbitem.hxx | 2 +- sfx2/inc/tplpitem.hxx | 2 +- sfx2/source/appl/app.cxx | 14 ++-- sfx2/source/appl/appbas.cxx | 10 +-- sfx2/source/appl/appcfg.cxx | 28 +++---- sfx2/source/appl/appchild.cxx | 4 +- sfx2/source/appl/appdata.cxx | 9 +- sfx2/source/appl/appdde.cxx | 10 +-- sfx2/source/appl/appinit.cxx | 8 +- sfx2/source/appl/appmain.cxx | 5 +- sfx2/source/appl/appmisc.cxx | 8 +- sfx2/source/appl/appopen.cxx | 12 +-- sfx2/source/appl/appquit.cxx | 6 +- sfx2/source/appl/appserv.cxx | 10 +-- sfx2/source/appl/appuno.cxx | 16 ++-- sfx2/source/appl/impldde.cxx | 2 +- sfx2/source/appl/linkmgr2.cxx | 2 +- sfx2/source/appl/linksrc.cxx | 2 +- sfx2/source/appl/lnkbase2.cxx | 2 +- sfx2/source/appl/sfxhelp.cxx | 13 ++- sfx2/source/appl/sfxpicklist.cxx | 6 +- sfx2/source/appl/workwin.cxx | 10 +-- sfx2/source/bastyp/fltfnc.cxx | 16 ++-- sfx2/source/bastyp/frmhtml.cxx | 2 +- sfx2/source/bastyp/frmhtmlw.cxx | 4 +- sfx2/source/bastyp/progress.cxx | 2 +- sfx2/source/bastyp/sfxhtml.cxx | 4 +- sfx2/source/config/evntconf.cxx | 2 +- sfx2/source/control/bindings.cxx | 14 ++-- sfx2/source/control/ctrlitem.cxx | 2 +- sfx2/source/control/dispatch.cxx | 14 ++-- sfx2/source/control/macrconf.cxx | 2 +- sfx2/source/control/msg.cxx | 4 +- sfx2/source/control/querystatus.cxx | 12 +-- sfx2/source/control/request.cxx | 6 +- sfx2/source/control/sfxstatuslistener.cxx | 12 +-- sfx2/source/control/shell.cxx | 4 +- sfx2/source/control/srchitem.cxx | 5 +- sfx2/source/control/statcach.cxx | 8 +- sfx2/source/control/unoctitm.cxx | 12 +-- sfx2/source/dialog/basedlgs.cxx | 2 +- sfx2/source/dialog/dinfdlg.cxx | 6 +- sfx2/source/dialog/dockwin.cxx | 2 +- sfx2/source/dialog/filedlghelper.cxx | 10 +-- sfx2/source/dialog/filedlgimpl.hxx | 2 +- sfx2/source/dialog/itemconnect.cxx | 2 +- sfx2/source/dialog/mailmodelapi.cxx | 4 +- sfx2/source/dialog/mgetempl.cxx | 8 +- sfx2/source/dialog/newstyle.cxx | 2 +- sfx2/source/dialog/printopt.cxx | 2 +- sfx2/source/dialog/recfloat.cxx | 2 +- sfx2/source/dialog/styledlg.cxx | 4 +- sfx2/source/dialog/tabdlg.cxx | 2 +- sfx2/source/dialog/templdlg.cxx | 8 +- sfx2/source/dialog/tplcitem.cxx | 2 +- sfx2/source/dialog/versdlg.cxx | 10 +-- sfx2/source/doc/doc.src | 2 +- sfx2/source/doc/docfile.cxx | 16 ++-- sfx2/source/doc/docinsert.cxx | 10 +-- sfx2/source/doc/doctdlg.cxx | 2 +- sfx2/source/doc/docvor.cxx | 8 +- sfx2/source/doc/frmdescr.cxx | 2 +- sfx2/source/doc/guisaveas.cxx | 3 +- sfx2/source/doc/new.cxx | 4 +- sfx2/source/doc/objcont.cxx | 14 ++-- sfx2/source/doc/objmisc.cxx | 12 +-- sfx2/source/doc/objserv.cxx | 6 +- sfx2/source/doc/objstor.cxx | 6 +- sfx2/source/doc/objuno.cxx | 2 +- sfx2/source/doc/objxtor.cxx | 10 +-- sfx2/source/doc/printhelper.cxx | 8 +- sfx2/source/doc/sfxbasemodel.cxx | 6 +- sfx2/source/explorer/nochaos.cxx | 6 +- sfx2/source/inc/appdata.hxx | 4 +- sfx2/source/inc/applet.hxx | 4 +- sfx2/source/inc/eventsupplier.hxx | 2 +- sfx2/source/inc/helpid.hrc | 2 +- sfx2/source/inc/iframe.hxx | 4 +- sfx2/source/inc/plugin.hxx | 4 +- sfx2/source/inc/sfxpicklist.hxx | 2 +- sfx2/source/inc/templdgi.hxx | 6 +- sfx2/source/inc/virtmenu.hxx | 2 +- sfx2/source/inc/workwin.hxx | 2 +- sfx2/source/inet/inettbc.cxx | 12 +-- sfx2/source/layout/sfxtabdialog.cxx | 2 +- sfx2/source/menu/mnuitem.cxx | 4 +- sfx2/source/menu/mnumgr.cxx | 2 +- sfx2/source/menu/objmnctl.cxx | 2 +- sfx2/source/menu/virtmenu.cxx | 2 +- sfx2/source/notify/eventsupplier.cxx | 2 +- sfx2/source/statbar/stbitem.cxx | 8 +- sfx2/source/toolbox/tbxitem.cxx | 12 +-- sfx2/source/view/frame.cxx | 6 +- sfx2/source/view/frmload.cxx | 6 +- sfx2/source/view/impframe.cxx | 2 +- sfx2/source/view/impframe.hxx | 2 +- sfx2/source/view/ipclient.cxx | 2 +- sfx2/source/view/prnmon.cxx | 2 +- sfx2/source/view/topfrm.cxx | 10 +-- sfx2/source/view/viewfrm.cxx | 14 ++-- sfx2/source/view/viewprn.cxx | 10 +-- sfx2/source/view/viewsh.cxx | 8 +- svx/inc/bolnitem.hxx | 2 +- svx/inc/bulitem.hxx | 2 +- svx/inc/charhiddenitem.hxx | 4 +- svx/inc/chrtitem.hxx | 2 +- svx/inc/clipboardctl.hxx | 2 +- svx/inc/clipfmtitem.hxx | 2 +- svx/inc/dlgutil.hxx | 4 +- svx/inc/drawitem.hxx | 2 +- svx/inc/editund2.hxx | 2 +- svx/inc/extrusioncontrols.hxx | 2 +- svx/inc/flstitem.hxx | 2 +- svx/inc/fmhelp.hrc | 2 +- svx/inc/fontitem.hxx | 2 +- svx/inc/fwdtitem.hxx | 2 +- svx/inc/galbrws2.hxx | 2 +- svx/inc/galctrl.hxx | 2 +- svx/inc/galdlg.hxx | 2 +- svx/inc/gallery1.hxx | 2 +- svx/inc/galmisc.hxx | 2 +- svx/inc/galtheme.hxx | 4 +- svx/inc/grafctrl.hxx | 4 +- svx/inc/helpid.hrc | 2 +- svx/inc/hlnkitem.hxx | 4 +- svx/inc/htmlcfg.hxx | 3 +- svx/inc/linectrl.hxx | 2 +- svx/inc/nlbkitem.hxx | 2 +- svx/inc/ofaitem.hxx | 2 +- svx/inc/opaqitem.hxx | 2 +- svx/inc/optgrid.hxx | 2 +- svx/inc/optitems.hxx | 2 +- svx/inc/pch/precompiled_svx.hxx | 84 +++++++++---------- svx/inc/pgrditem.hxx | 2 +- svx/inc/postattr.hxx | 2 +- svx/inc/prntitem.hxx | 2 +- svx/inc/protitem.hxx | 2 +- svx/inc/rotmodit.hxx | 2 +- svx/inc/rulritem.hxx | 2 +- svx/inc/srchdlg.hxx | 4 +- svx/inc/svx/SmartTagItem.hxx | 2 +- svx/inc/svx/adjitem.hxx | 2 +- svx/inc/svx/akrnitem.hxx | 2 +- svx/inc/svx/algitem.hxx | 4 +- svx/inc/svx/blnkitem.hxx | 4 +- svx/inc/svx/borderline.hxx | 2 +- svx/inc/svx/boxitem.hxx | 2 +- svx/inc/svx/brkitem.hxx | 2 +- svx/inc/svx/brshitem.hxx | 2 +- svx/inc/svx/charreliefitem.hxx | 2 +- svx/inc/svx/charrotateitem.hxx | 2 +- svx/inc/svx/charscaleitem.hxx | 2 +- svx/inc/svx/cmapitem.hxx | 2 +- svx/inc/svx/cntritem.hxx | 2 +- svx/inc/svx/colrctrl.hxx | 2 +- svx/inc/svx/colritem.hxx | 2 +- svx/inc/svx/crsditem.hxx | 2 +- svx/inc/svx/dlgctl3d.hxx | 2 +- svx/inc/svx/e3ditem.hxx | 2 +- svx/inc/svx/editdata.hxx | 2 +- svx/inc/svx/editobj.hxx | 2 +- svx/inc/svx/emphitem.hxx | 2 +- svx/inc/svx/escpitem.hxx | 2 +- svx/inc/svx/fhgtitem.hxx | 2 +- svx/inc/svx/fillctrl.hxx | 2 +- svx/inc/svx/flditem.hxx | 2 +- svx/inc/svx/fmsearch.hxx | 2 +- svx/inc/svx/fntctl.hxx | 2 +- svx/inc/svx/forbiddenruleitem.hxx | 2 +- svx/inc/svx/frmdiritem.hxx | 2 +- svx/inc/svx/grfcrop.hxx | 2 +- svx/inc/svx/hngpnctitem.hxx | 2 +- svx/inc/svx/hyznitem.hxx | 2 +- svx/inc/svx/itemtype.hxx | 2 +- svx/inc/svx/keepitem.hxx | 2 +- svx/inc/svx/kernitem.hxx | 2 +- svx/inc/svx/langitem.hxx | 2 +- svx/inc/svx/lrspitem.hxx | 2 +- svx/inc/svx/lspcitem.hxx | 2 +- svx/inc/svx/msdffimp.hxx | 2 +- svx/inc/svx/nhypitem.hxx | 2 +- svx/inc/svx/numfmtsh.hxx | 2 +- svx/inc/svx/numinf.hxx | 2 +- svx/inc/svx/numitem.hxx | 2 +- svx/inc/svx/obj3d.hxx | 2 +- svx/inc/svx/orphitem.hxx | 2 +- svx/inc/svx/outliner.hxx | 2 +- svx/inc/svx/pageitem.hxx | 2 +- svx/inc/svx/paravertalignitem.hxx | 2 +- svx/inc/svx/pbinitem.hxx | 2 +- svx/inc/svx/pmdlitem.hxx | 2 +- svx/inc/svx/postitem.hxx | 2 +- svx/inc/svx/prszitem.hxx | 2 +- svx/inc/svx/ruler.hxx | 2 +- svx/inc/svx/scriptspaceitem.hxx | 2 +- svx/inc/svx/scripttypeitem.hxx | 4 +- svx/inc/svx/sdangitm.hxx | 2 +- svx/inc/svx/sdasaitm.hxx | 2 +- svx/inc/svx/sdasitm.hxx | 2 +- svx/inc/svx/sdggaitm.hxx | 2 +- svx/inc/svx/sdgmoitm.hxx | 2 +- svx/inc/svx/sdmetitm.hxx | 2 +- svx/inc/svx/sdooitm.hxx | 2 +- svx/inc/svx/sdprcitm.hxx | 2 +- svx/inc/svx/sdr/properties/attributeproperties.hxx | 2 +- svx/inc/svx/sdrpagewindow.hxx | 2 +- svx/inc/svx/sdtaaitm.hxx | 2 +- svx/inc/svx/sdtacitm.hxx | 2 +- svx/inc/svx/sdtaditm.hxx | 2 +- svx/inc/svx/sdtaitm.hxx | 2 +- svx/inc/svx/sdtakitm.hxx | 2 +- svx/inc/svx/sdtayitm.hxx | 2 +- svx/inc/svx/sdtfsitm.hxx | 2 +- svx/inc/svx/sdynitm.hxx | 2 +- svx/inc/svx/shaditem.hxx | 2 +- svx/inc/svx/shdditem.hxx | 2 +- svx/inc/svx/sizeitem.hxx | 2 +- svx/inc/svx/spltitem.hxx | 2 +- svx/inc/svx/svdattr.hxx | 2 +- svx/inc/svx/svdfppt.hxx | 2 +- svx/inc/svx/svdhdl.hxx | 2 +- svx/inc/svx/svdmodel.hxx | 6 +- svx/inc/svx/svdobj.hxx | 2 +- svx/inc/svx/svdpagv.hxx | 2 +- svx/inc/svx/svdpntv.hxx | 14 ++-- svx/inc/svx/svdundo.hxx | 4 +- svx/inc/svx/svdview.hxx | 5 +- svx/inc/svx/svx3ditems.hxx | 4 +- svx/inc/svx/svxacorr.hxx | 2 +- svx/inc/svx/svxbox.hxx | 2 +- svx/inc/svx/svxids.hrc | 4 +- svx/inc/svx/svxitems.hrc | 2 +- svx/inc/svx/sxcecitm.hxx | 2 +- svx/inc/svx/sxcikitm.hxx | 2 +- svx/inc/svx/sxctitm.hxx | 2 +- svx/inc/svx/sxekitm.hxx | 2 +- svx/inc/svx/sxfiitm.hxx | 2 +- svx/inc/svx/sxlayitm.hxx | 4 +- svx/inc/svx/sxmfsitm.hxx | 2 +- svx/inc/svx/sxmkitm.hxx | 2 +- svx/inc/svx/sxmtpitm.hxx | 2 +- svx/inc/svx/sxmuitm.hxx | 2 +- svx/inc/svx/sxonitm.hxx | 2 +- svx/inc/svx/tbcontrl.hxx | 2 +- svx/inc/svx/tstpitem.hxx | 2 +- svx/inc/svx/twolinesitem.hxx | 2 +- svx/inc/svx/udlnitem.hxx | 2 +- svx/inc/svx/ulspitem.hxx | 2 +- svx/inc/svx/unoedsrc.hxx | 4 +- svx/inc/svx/unoipset.hxx | 2 +- svx/inc/svx/unopage.hxx | 2 +- svx/inc/svx/unoprov.hxx | 2 +- svx/inc/svx/unoshape.hxx | 2 +- svx/inc/svx/unoshprp.hxx | 2 +- svx/inc/svx/unotext.hxx | 6 +- svx/inc/svx/viewlayoutitem.hxx | 2 +- svx/inc/svx/wghtitem.hxx | 2 +- svx/inc/svx/widwitem.hxx | 2 +- svx/inc/svx/writingmodeitem.hxx | 2 +- svx/inc/svx/wrlmitem.hxx | 2 +- svx/inc/svx/xfillit.hxx | 2 +- svx/inc/svx/xfillit0.hxx | 2 +- svx/inc/svx/xflasit.hxx | 2 +- svx/inc/svx/xflbckit.hxx | 2 +- svx/inc/svx/xflbmpit.hxx | 2 +- svx/inc/svx/xflbmsli.hxx | 2 +- svx/inc/svx/xflbmsxy.hxx | 2 +- svx/inc/svx/xflbmtit.hxx | 2 +- svx/inc/svx/xflboxy.hxx | 2 +- svx/inc/svx/xflbstit.hxx | 2 +- svx/inc/svx/xflbtoxy.hxx | 2 +- svx/inc/svx/xfltrit.hxx | 2 +- svx/inc/svx/xftadit.hxx | 2 +- svx/inc/svx/xftdiit.hxx | 2 +- svx/inc/svx/xftmrit.hxx | 2 +- svx/inc/svx/xftshit.hxx | 2 +- svx/inc/svx/xftshtit.hxx | 2 +- svx/inc/svx/xftshxy.hxx | 2 +- svx/inc/svx/xftstit.hxx | 2 +- svx/inc/svx/xgrscit.hxx | 2 +- svx/inc/svx/xit.hxx | 2 +- svx/inc/svx/xlineit.hxx | 4 +- svx/inc/svx/xlineit0.hxx | 2 +- svx/inc/svx/xlnasit.hxx | 2 +- svx/inc/svx/xlnedcit.hxx | 2 +- svx/inc/svx/xlnedwit.hxx | 2 +- svx/inc/svx/xlnstcit.hxx | 2 +- svx/inc/svx/xlnstwit.hxx | 2 +- svx/inc/svx/xlntrit.hxx | 2 +- svx/inc/svx/xlnwtit.hxx | 2 +- svx/inc/svx/xpool.hxx | 2 +- svx/inc/svx/xsetit.hxx | 4 +- svx/inc/svx/xtextit.hxx | 4 +- svx/inc/svx/xtextit0.hxx | 2 +- svx/inc/svx/zoomitem.hxx | 2 +- svx/inc/svx/zoomslideritem.hxx | 2 +- svx/inc/svxgrahicitem.hxx | 2 +- svx/inc/svxrtf.hxx | 4 +- svx/inc/txtrange.hxx | 2 +- svx/inc/unoapi.hxx | 2 +- svx/inc/unoedhlp.hxx | 2 +- svx/inc/unofdesc.hxx | 2 +- svx/inc/xlinjoit.hxx | 2 +- svx/inc/xmlcnitm.hxx | 2 +- .../accessibility/AccessibleEmptyEditSource.cxx | 2 +- .../accessibility/AccessibleEmptyEditSource.hxx | 4 +- .../accessibility/GraphCtlAccessibleContext.cxx | 2 +- svx/source/cui/SpellDialog.cxx | 2 +- svx/source/cui/acccfg.cxx | 2 +- svx/source/cui/acccfg.hxx | 2 +- svx/source/cui/align.cxx | 6 +- svx/source/cui/autocdlg.cxx | 8 +- svx/source/cui/backgrnd.cxx | 6 +- svx/source/cui/border.cxx | 2 +- svx/source/cui/cfg.cxx | 2 +- svx/source/cui/cfg.hxx | 2 +- svx/source/cui/cfgchart.cxx | 4 + svx/source/cui/cfgchart.hxx | 3 +- svx/source/cui/cfgutil.cxx | 4 +- svx/source/cui/cfgutil.hxx | 2 +- svx/source/cui/chardlg.cxx | 8 +- svx/source/cui/connpoolconfig.cxx | 4 +- svx/source/cui/connpooloptions.cxx | 2 +- svx/source/cui/connpooloptions.hxx | 2 +- svx/source/cui/connpoolsettings.hxx | 2 +- svx/source/cui/cuicharmap.cxx | 10 +-- svx/source/cui/cuifmsearch.cxx | 4 +- svx/source/cui/cuifmsearch.hxx | 2 +- svx/source/cui/cuigaldlg.cxx | 4 +- svx/source/cui/cuigaldlg.hxx | 2 +- svx/source/cui/cuiimapwnd.cxx | 4 +- svx/source/cui/cuiimapwnd.hxx | 2 +- svx/source/cui/cuisrchdlg.cxx | 8 +- svx/source/cui/cuisrchdlg.hxx | 4 +- svx/source/cui/cuitbxform.cxx | 6 +- svx/source/cui/dbregister.cxx | 6 +- svx/source/cui/dbregister.hxx | 2 +- svx/source/cui/dbregisterednamesconfig.cxx | 4 +- svx/source/cui/dbregistersettings.hxx | 2 +- svx/source/cui/doclinkdialog.cxx | 2 +- svx/source/cui/grfpage.cxx | 2 +- svx/source/cui/hlinettp.cxx | 3 +- svx/source/cui/hltpbase.cxx | 2 +- svx/source/cui/hltpbase.hxx | 4 +- svx/source/cui/iconcdlg.cxx | 2 +- svx/source/cui/iconcdlg.hxx | 4 +- svx/source/cui/insdlg.cxx | 6 +- svx/source/cui/internationaloptions.cxx | 2 +- svx/source/cui/linkdlg.cxx | 2 +- svx/source/cui/macroass.cxx | 4 +- svx/source/cui/macroass.hxx | 2 +- svx/source/cui/macropg.cxx | 4 +- svx/source/cui/macropg.hxx | 2 +- svx/source/cui/numfmt.cxx | 6 +- svx/source/cui/numpages.cxx | 12 +-- svx/source/cui/numpages.hxx | 2 +- svx/source/cui/optctl.cxx | 2 +- svx/source/cui/optdict.cxx | 2 +- svx/source/cui/optgdlg.cxx | 12 +-- svx/source/cui/optinet2.cxx | 18 ++-- svx/source/cui/optinet2.hxx | 2 +- svx/source/cui/optmemory.cxx | 10 +-- svx/source/cui/optpath.cxx | 4 +- svx/source/cui/optsave.cxx | 4 +- svx/source/cui/optupdt.cxx | 2 +- svx/source/cui/page.cxx | 20 +++-- svx/source/cui/paragrph.cxx | 8 +- svx/source/cui/postdlg.cxx | 4 +- svx/source/cui/scriptdlg.hrc | 2 +- svx/source/cui/sdrcelldlg.cxx | 2 +- svx/source/cui/selector.cxx | 2 +- svx/source/cui/selector.hxx | 2 +- svx/source/cui/splitcelldlg.cxx | 4 +- svx/source/cui/srchxtra.cxx | 4 +- svx/source/cui/svuidlg.hrc | 2 +- svx/source/cui/swpossizetabpage.cxx | 2 +- svx/source/cui/tabstpge.cxx | 4 +- svx/source/cui/tparea.cxx | 2 +- svx/source/cui/transfrm.cxx | 4 +- svx/source/cui/treeopt.cxx | 33 ++++---- svx/source/cui/zoom.cxx | 4 +- svx/source/customshapes/EnhancedCustomShape2d.hxx | 2 +- svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 +- .../customshapes/EnhancedCustomShapeEngine.cxx | 2 +- svx/source/customshapes/tbxcustomshapes.cxx | 2 +- svx/source/dialog/_bmpmask.cxx | 2 +- svx/source/dialog/_contdlg.cxx | 2 +- svx/source/dialog/charmap.cxx | 2 +- svx/source/dialog/databaseregistrationui.cxx | 2 +- svx/source/dialog/dialmgr.cxx | 2 +- svx/source/dialog/dlgctl3d.cxx | 2 +- svx/source/dialog/dlgutil.cxx | 2 +- svx/source/dialog/fntctrl.cxx | 2 +- svx/source/dialog/graphctl.cxx | 4 +- svx/source/dialog/hdft.cxx | 2 +- svx/source/dialog/hyprlink.cxx | 18 +++- svx/source/dialog/imapdlg.cxx | 4 +- svx/source/dialog/imapwnd.cxx | 4 +- svx/source/dialog/imapwnd.hxx | 2 +- svx/source/dialog/impgrf.cxx | 4 +- svx/source/dialog/opengrf.cxx | 2 +- svx/source/dialog/rlrcitem.cxx | 4 +- svx/source/dialog/rubydialog.cxx | 2 +- svx/source/dialog/srchctrl.cxx | 2 +- svx/source/dialog/srchdlg.cxx | 10 +-- svx/source/dialog/svxbmpnumvalueset.cxx | 8 +- svx/source/dialog/svxruler.cxx | 6 +- svx/source/dialog/thesdlg.cxx | 2 +- svx/source/editeng/SvXMLAutoCorrectExport.cxx | 2 +- svx/source/editeng/SvXMLAutoCorrectImport.cxx | 2 +- svx/source/editeng/acorrcfg.cxx | 2 +- svx/source/editeng/editattr.hxx | 2 +- svx/source/editeng/editdbg.hxx | 2 +- svx/source/editeng/editdoc.hxx | 6 +- svx/source/editeng/editdoc2.cxx | 2 +- svx/source/editeng/editeng.cxx | 4 +- svx/source/editeng/editeng.hrc | 2 +- svx/source/editeng/editobj.cxx | 2 +- svx/source/editeng/editview.cxx | 4 +- svx/source/editeng/edtspell.cxx | 4 +- svx/source/editeng/eehtml.hxx | 2 +- svx/source/editeng/eeobj.cxx | 2 +- svx/source/editeng/eerdll.cxx | 4 +- svx/source/editeng/eertfpar.cxx | 2 +- svx/source/editeng/impedit.cxx | 2 +- svx/source/editeng/impedit.hxx | 2 +- svx/source/editeng/impedit2.cxx | 4 +- svx/source/editeng/impedit3.cxx | 4 +- svx/source/editeng/impedit5.cxx | 2 +- svx/source/editeng/svxacorr.cxx | 6 +- svx/source/engine3d/float3d.cxx | 6 +- svx/source/engine3d/obj3d.cxx | 4 +- svx/source/engine3d/polysc3d.cxx | 4 +- svx/source/engine3d/scene3d.cxx | 4 +- svx/source/fmcomp/fmgridcl.cxx | 6 +- svx/source/fmcomp/gridcell.cxx | 2 +- svx/source/form/ParseContext.cxx | 2 +- svx/source/form/databaselocationinput.cxx | 2 +- svx/source/form/datanavi.cxx | 2 +- svx/source/form/fmexch.cxx | 4 +- svx/source/form/fmshell.cxx | 10 +-- svx/source/form/fmshimp.cxx | 4 + svx/source/form/fmsrccfg.cxx | 2 +- svx/source/form/fmsrcimp.cxx | 2 +- svx/source/form/fmtextcontroldialogs.cxx | 4 +- svx/source/form/fmtextcontrolshell.cxx | 10 +-- svx/source/form/fmtools.cxx | 4 +- svx/source/form/fmundo.cxx | 2 +- svx/source/form/formcontrolfactory.cxx | 2 +- svx/source/form/tbxform.cxx | 6 +- svx/source/form/typemap.cxx | 4 +- svx/source/gallery2/galbrws1.hxx | 2 +- svx/source/gallery2/galbrws2.cxx | 8 +- svx/source/gallery2/galmisc.cxx | 6 +- svx/source/gallery2/galobj.cxx | 2 +- svx/source/gallery2/galtheme.cxx | 2 +- svx/source/inc/GraphCtlAccessibleContext.hxx | 2 +- svx/source/inc/SpellDialog.hxx | 2 +- svx/source/inc/filtnav.hxx | 6 +- svx/source/inc/fmexpl.hxx | 6 +- svx/source/inc/fmitems.hxx | 2 +- svx/source/inc/fmresids.hrc | 2 +- svx/source/inc/fmshimp.hxx | 9 +- svx/source/inc/fmtools.hxx | 2 +- svx/source/inc/fmundo.hxx | 2 +- svx/source/inc/svdoimp.hxx | 2 +- svx/source/inc/unoedprx.hxx | 2 +- svx/source/intro/iso.src | 2 +- svx/source/intro/ooo.src | 2 +- svx/source/items/SmartTagItem.cxx | 2 +- svx/source/items/clipfmtitem.cxx | 2 +- svx/source/items/flditem.cxx | 2 +- svx/source/items/frmitems.cxx | 4 +- svx/source/items/numfmtsh.cxx | 4 +- svx/source/items/pageitem.cxx | 2 +- svx/source/items/paraitem.cxx | 6 +- svx/source/items/textitem.cxx | 6 +- svx/source/mnuctrls/SmartTagCtl.cxx | 2 +- svx/source/mnuctrls/clipboardctl.cxx | 4 +- svx/source/mnuctrls/fntszctl.cxx | 2 +- svx/source/msfilter/msdffimp.cxx | 4 +- svx/source/options/asiancfg.cxx | 2 +- svx/source/options/htmlcfg.cxx | 5 ++ svx/source/options/optlingu.cxx | 8 +- svx/source/options/srchcfg.cxx | 2 +- svx/source/outliner/outl_pch.hxx | 2 +- svx/source/outliner/outleeng.cxx | 2 +- svx/source/outliner/outlin2.cxx | 2 +- svx/source/outliner/outliner.cxx | 8 +- svx/source/outliner/outliner.hrc | 2 +- svx/source/outliner/outlvw.cxx | 4 +- svx/source/sdr/attribute/sdrformtextattribute.cxx | 2 +- svx/source/sdr/contact/viewcontactofgraphic.cxx | 2 +- .../sdr/contact/viewcontactofsdrcaptionobj.cxx | 2 +- svx/source/sdr/contact/viewcontactofsdrcircobj.cxx | 2 +- .../sdr/contact/viewcontactofsdrmeasureobj.cxx | 2 +- svx/source/sdr/contact/viewcontactofsdrrectobj.cxx | 2 +- svx/source/sdr/primitive2d/sdrattributecreator.cxx | 4 +- .../sdr/primitive3d/sdrattributecreator3d.cxx | 2 +- svx/source/sdr/properties/attributeproperties.cxx | 10 +-- svx/source/sdr/properties/captionproperties.cxx | 4 +- svx/source/sdr/properties/circleproperties.cxx | 4 +- svx/source/sdr/properties/connectorproperties.cxx | 4 +- .../sdr/properties/customshapeproperties.cxx | 10 +-- svx/source/sdr/properties/defaultproperties.cxx | 4 +- .../sdr/properties/e3dcompoundproperties.cxx | 2 +- svx/source/sdr/properties/e3dextrudeproperties.cxx | 2 +- svx/source/sdr/properties/e3dlatheproperties.cxx | 2 +- svx/source/sdr/properties/e3dproperties.cxx | 2 +- svx/source/sdr/properties/e3dsceneproperties.cxx | 4 +- svx/source/sdr/properties/e3dsphereproperties.cxx | 2 +- svx/source/sdr/properties/emptyproperties.cxx | 2 +- svx/source/sdr/properties/graphicproperties.cxx | 4 +- svx/source/sdr/properties/groupproperties.cxx | 4 +- svx/source/sdr/properties/itemsettools.cxx | 4 +- svx/source/sdr/properties/measureproperties.cxx | 4 +- svx/source/sdr/properties/pageproperties.cxx | 2 +- svx/source/sdr/properties/properties.cxx | 2 +- svx/source/sdr/properties/textproperties.cxx | 8 +- svx/source/src/app.hrc | 2 +- svx/source/stbctrls/insctrl.cxx | 2 +- svx/source/stbctrls/modctrl.cxx | 2 +- svx/source/stbctrls/pszctrl.cxx | 6 +- svx/source/stbctrls/selctrl.cxx | 2 +- svx/source/stbctrls/xmlsecctrl.cxx | 6 +- svx/source/svdraw/svdattr.cxx | 2 +- svx/source/svdraw/svdedtv1.cxx | 6 +- svx/source/svdraw/svdedxv.cxx | 8 +- svx/source/svdraw/svdetc.cxx | 8 +- svx/source/svdraw/svdfmtf.cxx | 2 +- svx/source/svdraw/svdibrow.cxx | 10 +-- svx/source/svdraw/svdmark.cxx | 2 +- svx/source/svdraw/svdmodel.cxx | 10 +-- svx/source/svdraw/svdoashp.cxx | 4 +- svx/source/svdraw/svdoattr.cxx | 10 +-- svx/source/svdraw/svdobj.cxx | 2 +- svx/source/svdraw/svdocapt.cxx | 2 +- svx/source/svdraw/svdocirc.cxx | 2 +- svx/source/svdraw/svdoedge.cxx | 4 +- svx/source/svdraw/svdograf.cxx | 4 +- svx/source/svdraw/svdogrp.cxx | 4 +- svx/source/svdraw/svdomeas.cxx | 6 +- svx/source/svdraw/svdoole2.cxx | 4 +- svx/source/svdraw/svdopage.cxx | 2 +- svx/source/svdraw/svdotext.cxx | 6 +- svx/source/svdraw/svdotextdecomposition.cxx | 2 +- svx/source/svdraw/svdotextpathdecomposition.cxx | 2 +- svx/source/svdraw/svdotxat.cxx | 12 +-- svx/source/svdraw/svdotxed.cxx | 2 +- svx/source/svdraw/svdotxln.cxx | 2 +- svx/source/svdraw/svdotxtr.cxx | 2 +- svx/source/svdraw/svdoutl.cxx | 2 +- svx/source/svdraw/svdpntv.cxx | 22 ++--- svx/source/svdraw/svdtext.cxx | 2 +- svx/source/svdraw/svdtrans.cxx | 2 +- svx/source/svdraw/svdundo.cxx | 2 +- svx/source/svdraw/svdview.cxx | 14 ++-- svx/source/svdraw/svdviter.cxx | 2 +- svx/source/svdraw/svdxcgv.cxx | 6 +- svx/source/svrtf/rtfitem.cxx | 4 +- svx/source/svrtf/svxrtf.cxx | 6 +- svx/source/svxlink/linkmgr.cxx | 12 +-- svx/source/table/cell.cxx | 4 +- svx/source/table/celleditsource.cxx | 6 +- svx/source/table/svdotable.cxx | 2 +- svx/source/table/tablecontroller.cxx | 2 +- svx/source/tbxctrls/colorwindow.hxx | 2 +- svx/source/tbxctrls/extrusioncontrols.cxx | 4 +- svx/source/tbxctrls/fontworkgallery.cxx | 2 +- svx/source/tbxctrls/formatpaintbrushctrl.cxx | 2 +- svx/source/tbxctrls/grafctrl.cxx | 6 +- svx/source/tbxctrls/layctrl.cxx | 2 +- svx/source/tbxctrls/lboxctrl.cxx | 8 +- svx/source/tbxctrls/subtoolboxcontrol.cxx | 2 +- svx/source/tbxctrls/tbcontrl.cxx | 12 +-- svx/source/tbxctrls/tbxalign.cxx | 2 +- svx/source/tbxctrls/tbxdrctl.cxx | 2 +- svx/source/tbxctrls/verttexttbxctrl.cxx | 4 +- svx/source/toolbars/fontworkbar.cxx | 2 +- svx/source/unodraw/UnoGraphicExporter.cxx | 2 +- svx/source/unodraw/UnoNameItemTable.cxx | 6 +- svx/source/unodraw/UnoNameItemTable.hxx | 2 +- svx/source/unodraw/UnoNamespaceMap.cxx | 2 +- svx/source/unodraw/unobtabl.cxx | 4 +- svx/source/unodraw/unodtabl.cxx | 4 +- svx/source/unodraw/unofdesc.cxx | 2 +- svx/source/unodraw/unogtabl.cxx | 4 +- svx/source/unodraw/unohtabl.cxx | 4 +- svx/source/unodraw/unoipset.cxx | 4 +- svx/source/unodraw/unomod.cxx | 2 +- svx/source/unodraw/unomtabl.cxx | 8 +- svx/source/unodraw/unonrule.cxx | 2 +- svx/source/unodraw/unoshape.cxx | 2 +- svx/source/unodraw/unoshtxt.cxx | 6 +- svx/source/unodraw/unottabl.cxx | 4 +- svx/source/unoedit/unoedsrc.cxx | 2 +- svx/source/unoedit/unofored.cxx | 2 +- svx/source/unoedit/unoforou.cxx | 6 +- svx/source/unoedit/unotext.cxx | 8 +- svx/source/unoedit/unotext2.cxx | 2 +- svx/source/unogallery/unogalitem.cxx | 4 +- svx/source/unogallery/unogaltheme.hxx | 2 +- svx/source/xml/xmltxtexp.cxx | 4 +- svx/source/xml/xmltxtimp.cxx | 2 +- svx/source/xoutdev/_xoutbmp.cxx | 2 +- svx/source/xoutdev/xattr.cxx | 6 +- svx/source/xoutdev/xattrbmp.cxx | 2 +- svx/source/xoutdev/xexch.cxx | 8 +- svx/source/xoutdev/xpool.cxx | 2 +- svx/source/xoutdev/xtabbtmp.cxx | 2 +- svx/source/xoutdev/xtabdash.cxx | 2 +- svx/source/xoutdev/xtabgrdt.cxx | 2 +- svx/source/xoutdev/xtabhtch.cxx | 2 +- svx/source/xoutdev/xtablend.cxx | 2 +- svx/workben/edittest.cxx | 8 +- svx/workben/msview/msview.cxx | 2 +- uui/source/cookiedg.cxx | 2 +- uui/source/iahndl.cxx | 6 +- uui/source/ids.hrc | 2 +- xmloff/inc/pch/precompiled_xmloff.hxx | 16 ++-- xmloff/inc/xmlcnitm.hxx | 2 +- xmloff/inc/xmloff/xmlcnimp.hxx | 4 +- xmloff/source/core/i18nmap.cxx | 2 +- xmloff/source/core/xmlexp.cxx | 2 +- xmloff/source/core/xmlimp.cxx | 2 +- xmloff/source/core/xmltkmap.cxx | 2 +- xmloff/source/draw/ximpstyl.cxx | 2 +- xmloff/source/style/XMLFontAutoStylePool.cxx | 2 +- xmloff/source/style/impastpl.hxx | 2 +- xmloff/source/style/numehelp.cxx | 2 +- xmloff/source/style/styleexp.cxx | 2 +- xmloff/source/style/xmlexppr.cxx | 2 +- xmloff/source/style/xmlnumfe.cxx | 12 +-- xmloff/source/style/xmlnumfi.cxx | 8 +- xmloff/source/style/xmlnumi.cxx | 2 +- xmloff/source/style/xmlstyle.cxx | 4 +- xmloff/source/style/xmltabi.cxx | 2 +- xmloff/source/text/XMLTextColumnsContext.cxx | 2 +- xmloff/source/text/XMLTextListAutoStylePool.cxx | 2 +- xmloff/source/text/txtimp.cxx | 2 +- xmloff/source/text/txtparae.cxx | 4 +- xmloff/source/text/txtparai.cxx | 2 +- xmloff/source/text/txtparaimphint.hxx | 2 +- 812 files changed, 1605 insertions(+), 1543 deletions(-) (limited to 'xmloff/inc') diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx index d2ac1e9ea8..3a2c43686a 100644 --- a/avmedia/inc/avmedia/mediaitem.hxx +++ b/avmedia/inc/avmedia/mediaitem.hxx @@ -33,7 +33,7 @@ #include #ifndef _POOLITEM_HXX -#include +#include #endif #include diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx index 3dc7d2d235..6da465ee4b 100644 --- a/avmedia/inc/avmedia/mediatoolbox.hxx +++ b/avmedia/inc/avmedia/mediatoolbox.hxx @@ -31,7 +31,7 @@ #ifndef _AVMEDIA_MEDIATOOLBOX_HXX #define _AVMEDIA_MEDIATOOLBOX_HXX -#include +#include #include namespace avmedia diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index d5148aeacd..4ce7f12962 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -31,7 +31,7 @@ #ifndef _AVMEDIA_HELPIDS_HRC #define _AVMEDIA_HELPIDS_HRC -#include +#include #define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0) #define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1) diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 4675da3ac3..218740f0d1 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/avmedia/source/framework/mediamisc.cxx b/avmedia/source/framework/mediamisc.cxx index 28a3598e45..f52cabf231 100644 --- a/avmedia/source/framework/mediamisc.cxx +++ b/avmedia/source/framework/mediamisc.cxx @@ -29,7 +29,7 @@ ************************************************************************/ #include -#include +#include #include namespace avmedia { diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index 1042c8e670..bb77f8602d 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -35,7 +35,7 @@ #include "mediacontrol.hrc" #include "helpids.hrc" -#include +#include #include #include #include diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx index 3285c09527..8c9d084922 100644 --- a/basic/inc/basic/basmgr.hxx +++ b/basic/inc/basic/basmgr.hxx @@ -32,7 +32,7 @@ #define _BASMGR_HXX #include -#include +#include #include #include #include diff --git a/basic/inc/basic/sbdef.hxx b/basic/inc/basic/sbdef.hxx index c13cd69378..f7367c9364 100644 --- a/basic/inc/basic/sbdef.hxx +++ b/basic/inc/basic/sbdef.hxx @@ -32,7 +32,7 @@ #define _SB_SBDEF_HXX #include -#include +#include #define _BASIC_TEXTPORTIONS diff --git a/basic/inc/basic/sbx.hxx b/basic/inc/basic/sbx.hxx index 0a686e5d96..70ee8a2b7f 100644 --- a/basic/inc/basic/sbx.hxx +++ b/basic/inc/basic/sbx.hxx @@ -32,9 +32,9 @@ #define _SBXCLASS_HXX #include "tools/ref.hxx" -#include "svtools/svarray.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/lstner.hxx" +#include "svl/svarray.hxx" +#include "svl/smplhint.hxx" +#include "svl/lstner.hxx" #include #include diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx index 577e509b28..e3f72c7c79 100644 --- a/basic/inc/basic/sbxbase.hxx +++ b/basic/inc/basic/sbxbase.hxx @@ -33,7 +33,7 @@ #include #include "tools/list.hxx" -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include class SbxFactory; diff --git a/basic/inc/basic/sbxobj.hxx b/basic/inc/basic/sbxobj.hxx index a517b4375e..2792d6e5d4 100644 --- a/basic/inc/basic/sbxobj.hxx +++ b/basic/inc/basic/sbxobj.hxx @@ -31,7 +31,7 @@ #ifndef _SBX_SBXOBJECT_HXX #define _SBX_SBXOBJECT_HXX -#include +#include #include /////////////////////////////////////////////////////////////////////////// diff --git a/basic/inc/basic/testtool.hxx b/basic/inc/basic/testtool.hxx index a425844ce5..f8d65bce9e 100644 --- a/basic/inc/basic/testtool.hxx +++ b/basic/inc/basic/testtool.hxx @@ -30,7 +30,7 @@ #ifndef _BASIC_TESTTOOL_HXX_ #define _BASIC_TESTTOOL_HXX_ -#include +#include #include #define TESTTOOL_DEFAULT_PORT 12479 diff --git a/basic/inc/pch/precompiled_basic.hxx b/basic/inc/pch/precompiled_basic.hxx index 0a0ee33fd9..f1c120b261 100644 --- a/basic/inc/pch/precompiled_basic.hxx +++ b/basic/inc/pch/precompiled_basic.hxx @@ -173,35 +173,35 @@ #include "sot/storage.hxx" #include "sot/storinfo.hxx" -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include "svtools/ctrlbox.hxx" #include "svtools/ctrltool.hxx" #include "svtools/ehdl.hxx" #include "svtools/filedlg.hxx" -#include "svtools/hint.hxx" -#include "svtools/lstner.hxx" +#include "svl/hint.hxx" +#include "svl/lstner.hxx" #include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/solar.hrc" +#include "svl/smplhint.hxx" +#include "svl/solar.hrc" #include "svtools/stringtransfer.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svdde.hxx" +#include "svl/svarray.hxx" +#include "svl/svdde.hxx" #include "svtools/svmedit.hxx" -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include "svtools/svtdata.hxx" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "svtools/svtreebx.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #include "svtools/taskbar.hxx" #include "svtools/textdata.hxx" #include "svtools/texteng.hxx" #include "svtools/textview.hxx" #include "svtools/transfer.hxx" #include "svtools/txtattr.hxx" -#include "svtools/undo.hxx" -#include "svtools/zforlist.hxx" -#include "svtools/zformat.hxx" +#include "svl/undo.hxx" +#include "svl/zforlist.hxx" +#include "svl/zformat.hxx" #include "tools/color.hxx" diff --git a/basic/inc/sb.hrc b/basic/inc/sb.hrc index be03905eb0..6caf7ade5c 100644 --- a/basic/inc/sb.hrc +++ b/basic/inc/sb.hrc @@ -31,7 +31,7 @@ #ifndef _SB_HRC #define _SB_HRC -#include +#include #ifndef IDS_SBERR_START #define IDS_SBERR_START RID_BASIC_START diff --git a/basic/source/app/app.cxx b/basic/source/app/app.cxx index 00a7877fcf..9c7f457ad4 100644 --- a/basic/source/app/app.cxx +++ b/basic/source/app/app.cxx @@ -80,7 +80,7 @@ #include #include -#include +#include using namespace comphelper; using namespace cppu; diff --git a/basic/source/app/app.hxx b/basic/source/app/app.hxx index f348689773..b30b7261c2 100644 --- a/basic/source/app/app.hxx +++ b/basic/source/app/app.hxx @@ -42,8 +42,8 @@ #include #endif #include -#include -#include +#include +#include class BasicFrame; #include diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx index 122aa9c7a1..b2e3942d36 100644 --- a/basic/source/app/appedit.cxx +++ b/basic/source/app/appedit.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #ifndef _BASIC_TTRESHLP_HXX #include diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx index fa770f985f..2fc7baffe1 100644 --- a/basic/source/app/dialogs.cxx +++ b/basic/source/app/dialogs.cxx @@ -60,13 +60,13 @@ #include #include #ifndef _ZFORLIST_HXX //autogen -#include +#include #endif #include // Ohne Includeschutz #include -#include +#include #include diff --git a/basic/source/app/msgedit.cxx b/basic/source/app/msgedit.cxx index 1ef046170d..beabe69afe 100644 --- a/basic/source/app/msgedit.cxx +++ b/basic/source/app/msgedit.cxx @@ -48,7 +48,7 @@ Version 3 Changed Charset from CHARSET_IBMPC to RTL_TEXTENCODING_UTF8 #endif #include #include -#include +#include #ifndef _BASIC_TTRESHLP_HXX #include #endif diff --git a/basic/source/app/textedit.hxx b/basic/source/app/textedit.hxx index 19efd764c2..d31d013e36 100644 --- a/basic/source/app/textedit.hxx +++ b/basic/source/app/textedit.hxx @@ -40,7 +40,7 @@ class BreakpointWindow; #include #include #include -#include +#include #include #include "dataedit.hxx" diff --git a/basic/source/basmgr/basicmanagerrepository.cxx b/basic/source/basmgr/basicmanagerrepository.cxx index 2340c73269..3a0be2efa4 100644 --- a/basic/source/basmgr/basicmanagerrepository.cxx +++ b/basic/source/basmgr/basicmanagerrepository.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index e357d5828f..e4628c48bb 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index aed5b2b3c5..f54cdc800d 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 8ee3df992e..240927e75a 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -36,7 +36,7 @@ #ifndef _TOOLERR_HXX //autogen #include #endif -#include +#include #include #include diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 21b31020f9..f3d4d763dc 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include "sb.hxx" diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 663060638b..c6517459aa 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_PROPBAG_HXX #define _SFX_PROPBAG_HXX -#include +#include #ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HXX_ #include #endif diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx index 8b19aa6da6..e2510b0272 100644 --- a/basic/source/inc/symtbl.hxx +++ b/basic/source/inc/symtbl.hxx @@ -31,7 +31,7 @@ #ifndef _SYMTBL_HXX #define _SYMTBL_HXX -#include +#include #include #include #include diff --git a/basic/source/runtime/basrdll.cxx b/basic/source/runtime/basrdll.cxx index 51a1aa00b0..6933957799 100644 --- a/basic/source/runtime/basrdll.cxx +++ b/basic/source/runtime/basrdll.cxx @@ -33,7 +33,7 @@ #include #include #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx index 3a88477b5b..10a74a6748 100644 --- a/basic/source/runtime/ddectrl.cxx +++ b/basic/source/runtime/ddectrl.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include -#include +#include #include "ddectrl.hxx" #ifndef _SBERRORS_HXX #include diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx index 9cd003e858..f8689ddd10 100644 --- a/basic/source/runtime/dllmgr.hxx +++ b/basic/source/runtime/dllmgr.hxx @@ -32,9 +32,9 @@ #define _DLLMGR_HXX #define _SVSTDARR_BYTESTRINGSSORT -#include +#include #ifndef _SVSTDARR_HXX //autogen -#include +#include #endif // !!! nur zum debuggen fuer infoboxes !!! diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 5c1bae13ab..6621e6c3f0 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 08a94feefc..3f2b72af39 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -44,7 +44,7 @@ #ifndef _SBX_HXX #include #endif -#include +#include #include #include #include diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 361255af24..a7cf7277c0 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include "runtime.hxx" #include "sbintern.hxx" #include "opcodes.hxx" diff --git a/basic/source/sbx/format.src b/basic/source/sbx/format.src index dde88272eb..afdd3f8522 100644 --- a/basic/source/sbx/format.src +++ b/basic/source/sbx/format.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" String STR_BASICKEY_FORMAT_ON { diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index efa5daef97..cdfeb2dd3c 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" #include -#include +#include #include #include #include diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index 7f8584d889..e977456814 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -35,7 +35,7 @@ #include #include #include "sbxres.hxx" -#include +#include TYPEINIT1(SbxMethod,SbxVariable) TYPEINIT1(SbxProperty,SbxVariable) diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx index 07a3012b60..041e14b983 100644 --- a/basic/source/sbx/sbxscan.cxx +++ b/basic/source/sbx/sbxscan.cxx @@ -34,7 +34,7 @@ #include #include "sbxconv.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #if defined ( UNX ) #include @@ -50,12 +50,12 @@ #include "sbxres.hxx" #include #include -#include +#include #include "basrid.hxx" #include "runtime.hxx" -#include +#include #include diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index 1ecd20cc2b..b391023c20 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -33,7 +33,7 @@ #include -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include #include diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 20cb27644e..238381692b 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -1,4 +1,4 @@ -cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svtools UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL +cn connectivity : l10n comphelper MOZ:moz SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss NULL cn connectivity usr1 - all cn_mkout NULL cn connectivity\inc nmake - all cn_inc NULL cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 5160fc6bd9..58811abc5e 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -44,7 +44,7 @@ #include /** === end UNO includes === **/ -//#include +//#include #include diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index f108815a10..84d7054c71 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include "calc/CConnection.hxx" #include "calc/CColumns.hxx" #include "connectivity/sdbcx/VColumn.hxx" @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 216dc2d9fc..171f10ccdb 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "dbase/DConnection.hxx" #include "dbase/DColumns.hxx" #include @@ -44,8 +44,8 @@ #include "dbase/DIndexes.hxx" //#include "file/FDriver.hxx" #include -#include -#include +#include +#include #include #include //sprintf #include diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index 577d950ca6..91dc6eb310 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.cxx @@ -36,13 +36,13 @@ #include "LFolderList.hxx" #include #include -#include +#include #include "LConnection.hxx" #include "LColumns.hxx" #include #include #include -#include +#include #include #include //sprintf #include @@ -59,7 +59,7 @@ #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" #endif -#include +#include using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index 47e8368694..959980492e 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.cxx @@ -39,13 +39,13 @@ #ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ //#include #endif -#include +#include #include "LConnection.hxx" #include "LColumns.hxx" #include #include #include -#include +#include #include #include //sprintf #include @@ -56,7 +56,7 @@ #include #include "connectivity/dbconversion.hxx" #include -#include +#include #ifndef CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX #include "LDebug.hxx" #endif diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index c7e6a1617d..b227b0c232 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 1793cf58e3..f970646455 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -34,8 +34,8 @@ #include #include "connectivity/sqlparse.hxx" #include -#include #include +#include #include "TConnection.hxx" #include #include diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 7fbc472586..eac86a5a41 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -36,13 +36,13 @@ #include #include #include -#include +#include #include "flat/EConnection.hxx" #include "flat/EColumns.hxx" #include #include #include -#include +#include #include #include //sprintf #include @@ -54,7 +54,7 @@ #include "connectivity/dbconversion.hxx" #include #include "file/quotedstring.hxx" -#include +#include #include using namespace ::comphelper; diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0e09b8b87d..660db6a0c5 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -120,12 +120,13 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include +#include #include #include #include @@ -147,7 +148,7 @@ #include #include #include -#include +#include #include #include @@ -1329,7 +1330,7 @@ void Desktop::Main() //LanguageSelection langselect; OUString aUILocaleString = LanguageSelection::getLanguageString(); Locale aUILocale = LanguageSelection::IsoStringToLocale(aUILocaleString); - LanguageType eLanguage = SvtSysLocaleOptions().GetLocaleLanguageType(); + LanguageType eLanguage = SvtSysLocale().GetLanguage(); // #i39040#, do not call anything between GetSettings and SetSettings that might have // a side effect on the settings (like, eg, SvtSysLocaleOptions().GetLocaleLanguageType(), @@ -1820,10 +1821,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) hStyleSettings.SetDragFullOptions( nDragFullOptions ); rSettings.SetStyleSettings ( hStyleSettings ); - - MiscSettings aMiscSettings( rSettings.GetMiscSettings() ); - aMiscSettings.SetTwoDigitYearStart( (USHORT) SfxMiscCfg().GetYear2000() ); - rSettings.SetMiscSettings( aMiscSettings ); } // ======================================================================== diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 84bb6cd7b2..e2a8558372 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -41,7 +41,7 @@ #include #include "tools/getprocessworkingdir.hxx" -#include +#include using namespace rtl; using namespace com::sun::star::lang; diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 76d6710ba0..0a67c2017f 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -32,7 +32,7 @@ #define _DESKTOP_HRC_ #ifndef _SOLAR_HRC -#include +#include #endif #define RID_DESKTOP_DIALOG_START 2000 diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index 748b50fc65..7d233c2d58 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include namespace desktop { diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 920da56133..ccdeadbd7c 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -50,9 +50,9 @@ #include #endif #include -#include +#include #ifndef _SVTOOLS_SYSLOCALEOPTIONSOPTIONS_HXX -#include +#include #endif #include #include diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx index af99601334..dc9ea6fea8 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.cxx @@ -33,7 +33,7 @@ #include "svtools/svmedit2.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/xtextedt.hxx" #include "vcl/scrbar.hxx" diff --git a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx index c73a4df82c..6ed3d3c723 100644 --- a/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx +++ b/desktop/source/deployment/gui/dp_gui_autoscrolledit.hxx @@ -31,7 +31,7 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_AUTOSCROLLEDIT_HXX #include "svtools/svmedit2.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 4430b5b444..e8acd11e45 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -34,7 +34,7 @@ #include "dp_gui.hrc" #include "svtools/controldims.hrc" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "dp_gui.h" #include "dp_gui_dialog2.hxx" diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index d0e2c44be2..f8b3f2be40 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -43,7 +43,7 @@ #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/task/XJobExecutor.hpp" #include "svtools/svmedit.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/xtextedt.hxx" #include #include "vcl/threadex.hxx" diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index aff8ada634..f940366e06 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -49,7 +49,7 @@ #include "comphelper/servicedecl.hxx" #include "comphelper/sequence.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/lang/DisposedException.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/beans/UnknownPropertyException.hpp" diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 3f2def05d7..1da716513a 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -45,7 +45,7 @@ #include "comphelper/servicedecl.hxx" #include "comphelper/sequence.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" #include "com/sun/star/container/XNameContainer.hpp" #include "com/sun/star/container/XHierarchicalNameAccess.hpp" diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index bf63a338ee..e13d580e2b 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -45,7 +45,7 @@ #include "comphelper/anytostring.hxx" #include "comphelper/servicedecl.hxx" #include "xmlscript/xml_helper.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/ucb/NameClash.hpp" #include "com/sun/star/io/XActiveDataSink.hpp" #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 902d9f6645..5ecfab8b34 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -38,7 +38,7 @@ #include "osl/file.hxx" #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "cppuhelper/implbase1.hxx" using namespace ::com::sun::star; diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 8ef0a7141a..61636da1e2 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -38,7 +38,7 @@ #include "osl/file.hxx" #include "ucbhelper/content.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include #include diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 98f80df964..b4042d1969 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -44,7 +44,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/implbase1.hxx" #include "ucbhelper/content.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "comphelper/anytostring.hxx" #include "comphelper/makesequence.hxx" #include "comphelper/sequence.hxx" diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 1a8a0e4d1b..f5c2ee3e3e 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -40,7 +40,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "cppuhelper/implbase1.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "com/sun/star/util/XUpdatable.hpp" #include "com/sun/star/script/XLibraryContainer.hpp" #include diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index c460409890..953cdb8901 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -38,7 +38,7 @@ #include "ucbhelper/content.hxx" #include "cppuhelper/exc_hlp.hxx" #include "comphelper/servicedecl.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include #include #include diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 6532e1687e..7bbc194670 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -31,7 +31,7 @@ #if ! defined INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #define HID_GLOBAL_FALLBACK 0xFFFFFFFF diff --git a/desktop/source/migration/pages.hxx b/desktop/source/migration/pages.hxx index c5ab388687..f243fff61f 100644 --- a/desktop/source/migration/pages.hxx +++ b/desktop/source/migration/pages.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include namespace desktop diff --git a/drawinglayer/source/processor2d/canvasprocessor.cxx b/drawinglayer/source/processor2d/canvasprocessor.cxx index 77cb2b3350..2a1e699197 100644 --- a/drawinglayer/source/processor2d/canvasprocessor.cxx +++ b/drawinglayer/source/processor2d/canvasprocessor.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index 4f803e9366..747bb1c66d 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index 438d4da088..be01c94513 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,7 +31,7 @@ #define FORMULA_HELPID_HRC #ifndef _SOLAR_HRC -#include // HID_FORMULA_START +#include // HID_FORMULA_START #endif #define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0) diff --git a/formula/source/core/api/FormulaCompiler.cxx b/formula/source/core/api/FormulaCompiler.cxx index 5f8fd73be1..c236ddfb79 100644 --- a/formula/source/core/api/FormulaCompiler.cxx +++ b/formula/source/core/api/FormulaCompiler.cxx @@ -35,7 +35,7 @@ #include "core_resource.hxx" #include "core_resource.hrc" -#include +#include #include #include #include diff --git a/formula/source/core/inc/core_resource.hrc b/formula/source/core/inc/core_resource.hrc index a8cc75b67c..ecb21ef55b 100644 --- a/formula/source/core/inc/core_resource.hrc +++ b/formula/source/core/inc/core_resource.hrc @@ -31,7 +31,7 @@ #ifndef _FORMULA_CORE_RESOURCE_HRC_ #define _FORMULA_CORE_RESOURCE_HRC_ -#include +#include //------------------------------------------------------------------------------ #define RID_CORE_STRINGS_START RID_FORMULA_START diff --git a/formula/source/core/resource/core_resource.cxx b/formula/source/core/resource/core_resource.cxx index 088c5958f2..d61c479462 100644 --- a/formula/source/core/resource/core_resource.cxx +++ b/formula/source/core/resource/core_resource.cxx @@ -37,7 +37,7 @@ // ---- needed as long as we have no contexts for components --- #include -#include +#include //......................................................................... namespace formula diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index f5ba200853..678e011c6f 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -31,7 +31,7 @@ #include "formula/formulahelper.hxx" #include -#include +#include namespace formula { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 897f53b59b..e68775a6fc 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -47,9 +47,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 5256450a28..149684f17c 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include #include "formula/IFunctionDescription.hxx" #include "funcpage.hxx" diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index a0c26562a5..ddda38e485 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -35,8 +35,8 @@ //---------------------------------------------------------------------------- -#include -#include +#include +#include #include "parawin.hxx" #include "parawin.hrc" diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 1afb1c0fb4..846b32f5dd 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -35,8 +35,8 @@ //---------------------------------------------------------------------------- -#include -#include +#include +#include #include "structpg.hxx" #include "formdlgs.hrc" diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index a708b90364..e170c08c6d 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -34,7 +34,7 @@ // include ----------------------------------------------------------- #ifndef _SOLAR_HRC -#include +#include #endif #define RID_DIALOG_START RID_FORMULA_START diff --git a/formula/source/ui/resource/ModuleHelper.cxx b/formula/source/ui/resource/ModuleHelper.cxx index e6ea0353ce..8fca1dff65 100644 --- a/formula/source/ui/resource/ModuleHelper.cxx +++ b/formula/source/ui/resource/ModuleHelper.cxx @@ -37,7 +37,7 @@ #include #include #ifndef _SOLAR_HRC -#include +#include #endif #define EXPAND_PROTOCOL "vnd.sun.star.expand:" diff --git a/fpicker/source/aqua/resourceprovider.cxx b/fpicker/source/aqua/resourceprovider.cxx index 937e6fb962..7f40fa026d 100644 --- a/fpicker/source/aqua/resourceprovider.cxx +++ b/fpicker/source/aqua/resourceprovider.cxx @@ -41,7 +41,7 @@ #include #ifndef _SVTOOLS_SVTOOLS_HRC_ -#include +#include #endif #ifndef _SVTOOLS_FILEDLG2_HRC_ diff --git a/fpicker/source/generic/fpicker.cxx b/fpicker/source/generic/fpicker.cxx index 409e582742..f725a20c1f 100644 --- a/fpicker/source/generic/fpicker.cxx +++ b/fpicker/source/generic/fpicker.cxx @@ -38,7 +38,7 @@ #endif #include "com/sun/star/lang/XMultiComponentFactory.hpp" #include "svtools/miscopt.hxx" -#include "svtools/pickerhistoryaccess.hxx" +#include "svl/pickerhistoryaccess.hxx" #ifndef _SV_APP_HXX #include "vcl/svapp.hxx" diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index d357c618b3..7aed16688c 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -46,7 +46,7 @@ #include #include #define _SVSTDARR_STRINGSDTOR -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include #include #include diff --git a/fpicker/source/office/OfficeFilePicker.src b/fpicker/source/office/OfficeFilePicker.src index 908ce7e4af..c841631466 100644 --- a/fpicker/source/office/OfficeFilePicker.src +++ b/fpicker/source/office/OfficeFilePicker.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" String STR_SVT_FILEPICKER_AUTO_EXTENSION { diff --git a/fpicker/source/office/OfficeFolderPicker.cxx b/fpicker/source/office/OfficeFolderPicker.cxx index b6d04b0190..d9543a3aee 100644 --- a/fpicker/source/office/OfficeFolderPicker.cxx +++ b/fpicker/source/office/OfficeFolderPicker.cxx @@ -39,7 +39,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include #include #include diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c2dd487bde..3fc18c6fac 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -44,23 +44,23 @@ #include #include #include "svtools/ehdl.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include "unotools/pathoptions.hxx" #include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "unotools/inetoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include "svtools/svtabbx.hxx" #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" #include #include #ifndef _SVTOOLS_HRC -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #endif #ifndef _SVT_HELPID_HRC #include "svtools/helpid.hrc" @@ -72,7 +72,7 @@ #include "asyncfilepicker.hxx" #include "iodlgimp.hxx" #include "svtools/inettbc.hxx" -#include "svtools/syslocale.hxx" +#include "unotools/syslocale.hxx" #include "svtools/QueryFolderName.hxx" #ifndef _RTL_USTRING_HXX #include diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index eaaed21f90..ecd5fd98e1 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -32,7 +32,7 @@ #define _SVTOOLS_IODLGIMPL_HRC #ifndef _SVTOOLS_HRC -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #endif // ModalDialog DLG_SVT_EXPLORERFILE diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index c680e394d0..d0a6d1489d 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -46,9 +46,9 @@ #include #include #include -#include "svtools/inettype.hxx" -#include "svtools/urlfilter.hxx" -#include +#include "svl/inettype.hxx" +#include "svl/urlfilter.hxx" +#include #include "asyncfilepicker.hxx" #include "OfficeControlAccess.hxx" #include "fpsmartcontent.hxx" diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index 91538d1490..56ab98ac22 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -29,7 +29,7 @@ ************************************************************************/ // includes ****************************************************************** -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "svtools/helpid.hrc" #include "iodlg.hrc" diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 1db6c7eb64..db9a62fc96 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -43,8 +43,8 @@ #include #include // #97148# --------------- -#include "svtools/ctypeitm.hxx" -#include "svtools/eitem.hxx" +#include "svl/ctypeitm.hxx" +#include "svl/eitem.hxx" #include "unotools/viewoptions.hxx" #include "svtools/fileview.hxx" #include "svtools/inettbc.hxx" @@ -62,7 +62,7 @@ #define _SVSTDARR_STRINGSSORTDTOR #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_USHORTS -#include "svtools/svstdarr.hxx" +#include "svl/svstdarr.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 8d9df32ee9..07ad8af65a 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -37,7 +37,7 @@ #include #include -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include diff --git a/fpicker/source/unx/gnome/resourceprovider.cxx b/fpicker/source/unx/gnome/resourceprovider.cxx index 9197082b24..04c407b3df 100644 --- a/fpicker/source/unx/gnome/resourceprovider.cxx +++ b/fpicker/source/unx/gnome/resourceprovider.cxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include //------------------------------------------------------------ diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx index 70742bc955..a018ddbfd1 100644 --- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx +++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx @@ -65,7 +65,7 @@ #include #include -#include +#include #include diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index 803339892a..9f609a7769 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -46,7 +46,7 @@ #include #include -#include +#include //------------------------------------------------------------ // namespace directives diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index d51f5ea3cc..e50fa55e2c 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -194,6 +194,7 @@ class HandlerCFGAccess : public ::utl::ConfigItem void setCache(HandlerCache* pCache) {m_pCache = pCache;}; virtual void Notify(const css::uno::Sequence< rtl::OUString >& lPropertyNames); + virtual void Commit(); }; } // namespace framework diff --git a/framework/inc/framework.hrc b/framework/inc/framework.hrc index 068bdd0802..f7d9152ba5 100644 --- a/framework/inc/framework.hrc +++ b/framework/inc/framework.hrc @@ -31,7 +31,7 @@ #ifndef _FRAMEWORK_HRC #define _FRAMEWORK_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #define RID_FWK_START 260 diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 435b87a4f2..1bd908b266 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include namespace framework { diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 89e80a40ed..71f5253833 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include +#include // Help-Ids ----------------------------------------------------------------- diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 5d1d114124..fd211dd81e 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -388,24 +388,24 @@ #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" #include "unotools/historyoptions.hxx" -#include "svtools/imageitm.hxx" +#include "svl/imageitm.hxx" #include "svtools/imgdef.hxx" -#include "svtools/inettype.hxx" +#include "svl/inettype.hxx" #include "unotools/internaloptions.hxx" -#include "svtools/lstner.hxx" +#include "svl/lstner.hxx" #include "svtools/menuoptions.hxx" #include "svtools/miscopt.hxx" #include "unotools/moduleoptions.hxx" #include "unotools/pathoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/solar.hrc" +#include "svl/smplhint.hxx" +#include "svl/solar.hrc" #include "svtools/statusbarcontroller.hxx" -#include "svtools/svarray.hxx" +#include "svl/svarray.hxx" #include "svtools/svmedit.hxx" #include "svtools/toolboxcontroller.hxx" #include "svtools/transfer.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include "svtools/xtextedt.hxx" #include "toolkit/awt/vclxmenu.hxx" diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx index 7731455a50..a2a833ec9d 100644 --- a/framework/inc/services/licensedlg.hxx +++ b/framework/inc/services/licensedlg.hxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include namespace framework { diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 675d16ceb3..0c891e6ffb 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -139,6 +139,7 @@ class SubstitutePathVariables_Impl : public utl::ConfigItem /** is called from the ConfigManager before application ends or from the PropertyChangeListener if the sub tree broadcasts changes. */ virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); private: // Wrapper methods for low-level functions diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/xml/eventsconfiguration.hxx index 5431cf1d58..55f0dfe51f 100644 --- a/framework/inc/xml/eventsconfiguration.hxx +++ b/framework/inc/xml/eventsconfiguration.hxx @@ -31,7 +31,7 @@ #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ -#include +#include #include #include #include diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 624508d1b0..613636009d 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -31,7 +31,7 @@ #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ -#include +#include #include #include #include diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/xml/statusbarconfiguration.hxx index ac65225389..550d1fcbc2 100644 --- a/framework/inc/xml/statusbarconfiguration.hxx +++ b/framework/inc/xml/statusbarconfiguration.hxx @@ -1,7 +1,7 @@ #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ -#include +#include #include #include #include diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/xml/toolboxconfiguration.hxx index 0c35c46687..f1f0949e4e 100644 --- a/framework/inc/xml/toolboxconfiguration.hxx +++ b/framework/inc/xml/toolboxconfiguration.hxx @@ -1,7 +1,7 @@ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#include +#include #include #include #include diff --git a/framework/source/classes/protocolhandlercache.cxx b/framework/source/classes/protocolhandlercache.cxx index 3a1c4131c5..150cae4f0a 100644 --- a/framework/source/classes/protocolhandlercache.cxx +++ b/framework/source/classes/protocolhandlercache.cxx @@ -357,4 +357,8 @@ void HandlerCFGAccess::Notify(const css::uno::Sequence< rtl::OUString >& /*lProp } } +void HandlerCFGAccess::Commit() +{ +} + } // namespace framework diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index f223b85012..660846779e 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -91,7 +91,7 @@ #include #include #include -#include +#include #include diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index b769e0a89e..f1deffa53b 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -75,9 +75,9 @@ #include #ifndef _SOLAR_HRC -#include +#include #endif -#include +#include #include #include diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 55a953fa3d..39f4ab8de3 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -45,7 +45,7 @@ #include "unotools/dynamicmenuoptions.hxx" #include "svtools/imagemgr.hxx" -#include "svtools/svtools.hrc" +#include "svl/svtools.hrc" #include "comphelper/processfactory.hxx" #include "comphelper/sequenceashashmap.hxx" diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx index b5b7cfe062..74087a50bb 100644 --- a/framework/source/services/mediatypedetectionhelper.cxx +++ b/framework/source/services/mediatypedetectionhelper.cxx @@ -36,7 +36,7 @@ //_________________________________________________________________________________________________________________ #include #include -#include +#include #include #include diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index ee766efeee..3080f7cd8b 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -319,6 +319,11 @@ void SubstitutePathVariables_Impl::Notify( const com::sun::star::uno::Sequence< // NOT implemented yet! } +void SubstitutePathVariables_Impl::Commit() +{ +} + + //_________________________________________________________________________________________________________________ // private methods //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index bb33aa6c89..56cbdde695 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -62,7 +62,7 @@ #include #include #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index a2f8ec271a..d91d389931 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index a99c60a10e..00339698d9 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include #include diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 042b907f81..476e7c8837 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -91,7 +91,7 @@ #endif #include #include -#include +#include #include #include #include diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/misc.hxx index 307fd2a16b..5b3f4bffe4 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/misc.hxx @@ -50,7 +50,6 @@ #include #include #include -#include namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index dcda5d93df..33e25fd9a6 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -68,7 +68,7 @@ #include "convdic.hxx" -#include "convdicxml.hxx" +//#include "convdicxml.hxx" #include "misc.hxx" #include "defs.hxx" @@ -87,7 +87,7 @@ using namespace linguistic; /////////////////////////////////////////////////////////////////////////// - +#if XML void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) { if (rMainURL.Len() == 0) @@ -165,7 +165,7 @@ void ReadThroughDic( const String &rMainURL, ConvDicXMLImport &rImport ) { } } - +#endif BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) { @@ -186,6 +186,7 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) // first argument being 0 should stop the file from being parsed // up to the end (reading all entries) when the required // data (language, conversion type) is found. +#if XML ConvDicXMLImport *pImport = new ConvDicXMLImport( 0, rFileURL ); //!! keep a first reference to ensure the lifetime of the object !! @@ -201,6 +202,7 @@ BOOL IsConvDic( const String &rFileURL, INT16 &nLang, sal_Int16 &nConvType ) nLang = pImport->GetLanguage(); nConvType = pImport->GetConversionType(); } +#endif return bRes; } @@ -266,12 +268,12 @@ void ConvDic::Load() //!! prevent function from being called recursively via HasEntry, AddEntry bNeedEntries = FALSE; - +#if XML ConvDicXMLImport *pImport = new ConvDicXMLImport( this, aMainURL ); //!! keep a first reference to ensure the lifetime of the object !! uno::Reference< XInterface > xRef( (document::XFilter *) pImport, UNO_QUERY ); ReadThroughDic( aMainURL, *pImport ); // will implicitly add the entries - +#endif bIsModified = FALSE; } @@ -326,7 +328,7 @@ void ConvDic::Save() // prepare arguments (prepend doc handler to given arguments) uno::Reference< xml::sax::XDocumentHandler > xDocHandler( xSaxWriter, UNO_QUERY ); - +#if XML ConvDicXMLExport *pExport = new ConvDicXMLExport( *this, aMainURL, xDocHandler ); //!! keep a first(!) reference until everything is done to //!! ensure the proper lifetime of the object @@ -335,6 +337,7 @@ void ConvDic::Save() DBG_ASSERT( !pStream->GetError(), "I/O error while writing to stream" ); if (bRet) bIsModified = FALSE; +#endif } DBG_ASSERT( !bIsModified, "dictionary still modified after save. Save failed?" ); } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 37967955de..1a6243fa6c 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +//#include #include #include // helper for factories #include diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 65021041d6..36416d5561 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include "misc.hxx" diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index 1ada0a8fb8..86c6aee38b 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -77,7 +77,7 @@ public: void _ExportAutoStyles() {} void _ExportMasterStyles() {} void _ExportContent(); - sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); +// sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); sal_Bool Export(); }; diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 94caf22eec..c20ec2c3d3 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -63,7 +63,6 @@ #include #include #include -#include #include #include @@ -790,7 +789,10 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence( uno::Reference< i18n::XBreakIterator > xBreakIterator; if (!m_xBreakIterator.is()) { - m_xBreakIterator = vcl::unohelper::CreateBreakIterator(); + uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); + if ( xMSF.is() ) + xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance( + ::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY ); } sal_Int32 nTextLen = rText.getLength(); sal_Int32 nEndPosition = nTextLen; diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 9cac236ea0..931f9455a0 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +//#include #include #include #include diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 7bc8c343af..2c342a67d2 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 34ea7299a9..7a8233d0af 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include //using namespace utl; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 903afa2448..3b819154e1 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -36,7 +36,6 @@ #include "misc.hxx" #include #include -#include #include // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type #include // helper for implementations diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 63a4f63a98..695df4ac6c 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -42,15 +42,15 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include #include "misc.hxx" #include "defs.hxx" +#include namespace com { namespace sun { namespace star { namespace beans { diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index e5d9a39d19..64de21260c 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -288,7 +288,7 @@ class LngSvcMgrListenerHelper : > { LngSvcMgr &rMyManager; - Timer aLaunchTimer; +// Timer aLaunchTimer; //cppu::OMultiTypeInterfaceContainerHelper aListeners; ::cppu::OInterfaceContainerHelper aLngSvcMgrListeners; @@ -304,7 +304,8 @@ class LngSvcMgrListenerHelper : void LaunchEvent( INT16 nLngSvcEvtFlags ); - DECL_LINK( TimeOut, Timer* ); +// DECL_LINK( TimeOut, Timer* ); + long Timeout(); public: LngSvcMgrListenerHelper( LngSvcMgr &rLngSvcMgr, @@ -363,8 +364,8 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( //! listeners, and each of them is launching an event of it's own!) //! Thus this behaviour is necessary to avoid unecessary actions of //! this objects listeners! - aLaunchTimer.SetTimeout( 2000 ); - aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) ); +// aLaunchTimer.SetTimeout( 2000 ); +// aLaunchTimer.SetTimeoutHdl( LINK( this, LngSvcMgrListenerHelper, TimeOut ) ); nCombinedLngSvcEvt = 0; } @@ -385,11 +386,12 @@ void SAL_CALL LngSvcMgrListenerHelper::disposing( const lang::EventObject& rSour } -IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer ) +//IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer ) +long LngSvcMgrListenerHelper::Timeout() { osl::MutexGuard aGuard( GetLinguMutex() ); - if (&aLaunchTimer == pTimer) +// if (&aLaunchTimer == pTimer) { // change event source to LinguServiceManager since the listeners // probably do not know (and need not to know) about the specific @@ -416,7 +418,8 @@ IMPL_LINK( LngSvcMgrListenerHelper, TimeOut, Timer*, pTimer ) void LngSvcMgrListenerHelper::AddLngSvcEvt( INT16 nLngSvcEvt ) { nCombinedLngSvcEvt |= nLngSvcEvt; - aLaunchTimer.Start(); +// aLaunchTimer.Start(); + Timeout(); } diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 1c96adea46..7ee9ad0ba6 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -43,7 +43,7 @@ #include #include -#include +//#include #include "misc.hxx" #include "defs.hxx" diff --git a/linguistic/source/makefile.mk b/linguistic/source/makefile.mk index ccc9d1343f..6db2fae4da 100644 --- a/linguistic/source/makefile.mk +++ b/linguistic/source/makefile.mk @@ -41,10 +41,12 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- +# $(SLO)$/convdicxml.obj\ + + SLOFILES = \ $(SLO)$/convdiclist.obj\ $(SLO)$/convdic.obj\ - $(SLO)$/convdicxml.obj\ $(SLO)$/dicimp.obj\ $(SLO)$/dlistimp.obj\ $(SLO)$/hhconvdic.obj\ @@ -72,14 +74,14 @@ SHL1STDLIBS= \ $(VOSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ + $(SVLLIB) \ $(SALLIB) \ $(UCBHELPERLIB) \ $(UNOTOOLSLIB) \ - $(XMLOFFLIB) \ $(ICUUCLIB) + +# $(VCLLIB) \ +# $(XMLOFFLIB) \ # build DLL SHL1LIBS= $(SLB)$/$(TARGET).lib diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index d54a5b278a..b45e4eca3f 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include @@ -52,6 +52,7 @@ #include #include #include +#include #include @@ -59,7 +60,7 @@ #include "defs.hxx" #include "lngprops.hxx" #include "hyphdta.hxx" - +#include using namespace utl; using namespace osl; @@ -92,7 +93,7 @@ LocaleDataWrapper & GetLocaleDataWrapper( INT16 nLang ) { static LocaleDataWrapper aLclDtaWrp( getProcessServiceFactory(), - CreateLocale( Application::GetSettings().GetUILanguage() ) ); + CreateLocale( SvtSysLocale().GetUILanguage() ) ); const Locale &rLcl = aLclDtaWrp.getLoadedLocale(); Locale aLcl( CreateLocale( nLang ) ); diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index e88a509ccb..2c3c557109 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 9ba9f9f9ce..9310b5e213 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -32,7 +32,7 @@ #include "precompiled_linguistic.hxx" #include #include -#include +#include #include // helper for factories #include diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx index faff7e0234..6bd705ecf3 100644 --- a/sfx2/inc/arrdecl.hxx +++ b/sfx2/inc/arrdecl.hxx @@ -31,7 +31,7 @@ #define _SFX_ARRDECL_HXX #include -#include +#include #include struct CntUpdateResult; diff --git a/sfx2/inc/minfitem.hxx b/sfx2/inc/minfitem.hxx index ce7b0aeaaa..a5423b8784 100644 --- a/sfx2/inc/minfitem.hxx +++ b/sfx2/inc/minfitem.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include -#include +#include class BasicManager; class SFX2_DLLPUBLIC SfxMacroInfoItem: public SfxPoolItem diff --git a/sfx2/inc/msgnodei.hxx b/sfx2/inc/msgnodei.hxx index c26b5e2e8f..b3256bc789 100644 --- a/sfx2/inc/msgnodei.hxx +++ b/sfx2/inc/msgnodei.hxx @@ -32,9 +32,9 @@ #define _MSGNODEI_HXX -#include +#include #include -#include +#include #include struct SfxMsgAttachFile { String aFile; diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx index ac29d513cc..d8234f8edd 100644 --- a/sfx2/inc/orgmgr.hxx +++ b/sfx2/inc/orgmgr.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_ORGMGR_HXX #define _SFX_ORGMGR_HXX -#include +#include class SfxDocumentTemplates; class SfxOrganizeListBox_Impl; diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index 07483990a6..4970d67cf5 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -493,104 +493,104 @@ #include "sot/storinfo.hxx" #include "svtools/accessibilityoptions.hxx" #include "svtools/addxmltostorageoptions.hxx" -#include "svtools/adrparse.hxx" -#include "svtools/aeitem.hxx" +#include "unotools/adrparse.hxx" +#include "svl/aeitem.hxx" #include "svtools/asynclink.hxx" -#include "svtools/brdcst.hxx" -#include "svtools/cancel.hxx" -#include "svtools/cntwids.hrc" +#include "svl/brdcst.hxx" +#include "svl/cancel.hxx" +#include "svl/cntwids.hrc" #include "svtools/controldims.hrc" #include "svtools/cstitem.hxx" -#include "svtools/ctypeitm.hxx" +#include "svl/ctypeitm.hxx" #include "svtools/dateitem.hxx" #include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "svtools/embedhlp.hxx" #include "svtools/embedtransfer.hxx" #include "unotools/eventcfg.hxx" #include "unotools/extendedsecurityoptions.hxx" -#include "svtools/flagitem.hxx" -#include "svtools/folderrestriction.hxx" +#include "svl/flagitem.hxx" +#include "svl/folderrestriction.hxx" #include "unotools/fontoptions.hxx" #include "svtools/framestatuslistener.hxx" #include "svtools/helpopt.hxx" -#include "svtools/hint.hxx" +#include "svl/hint.hxx" #include "unotools/historyoptions.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/htmltokn.h" -#include "svtools/imageitm.hxx" +#include "svl/imageitm.hxx" #include "svtools/imagemgr.hxx" #include "svtools/imap.hxx" #include "svtools/imgdef.hxx" -#include "svtools/inetdef.hxx" -#include "svtools/inethist.hxx" -#include "svtools/inetmsg.hxx" +#include "svl/inetdef.hxx" +#include "svl/inethist.hxx" +#include "svl/inetmsg.hxx" #include "unotools/inetoptions.hxx" -#include "svtools/inetstrm.hxx" -#include "svtools/inettype.hxx" +#include "svl/inetstrm.hxx" +#include "svl/inettype.hxx" #include "unotools/internaloptions.hxx" -#include "svtools/intitem.hxx" -#include "svtools/isethint.hxx" +#include "svl/intitem.hxx" +#include "svl/isethint.hxx" #include "svtools/itemdel.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemprop.hxx" -#include "svtools/itemset.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemprop.hxx" +#include "svl/itemset.hxx" #include "svtools/javacontext.hxx" -#include "svtools/lckbitem.hxx" +#include "svl/lckbitem.hxx" #include "unotools/localisationoptions.hxx" #include "svtools/localresaccess.hxx" -#include "svtools/lstner.hxx" -#include "svtools/memberid.hrc" +#include "svl/lstner.hxx" +#include "svl/memberid.hrc" #include "svtools/menuoptions.hxx" -#include "svtools/misccfg.hxx" +#include "unotools/misccfg.hxx" #include "svtools/miscopt.hxx" #include "unotools/moduleoptions.hxx" -#include "svtools/ownlist.hxx" +#include "svl/ownlist.hxx" #include "svtools/parhtml.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/pickerhelper.hxx" -#include "svtools/poolitem.hxx" +#include "svl/pickerhelper.hxx" +#include "svl/poolitem.hxx" #include "svtools/printoptions.hxx" #include "unotools/printwarningoptions.hxx" -#include "svtools/rectitem.hxx" +#include "svl/rectitem.hxx" #include "unotools/regoptions.hxx" #include "unotools/saveopt.hxx" #include "unotools/searchopt.hxx" #include "unotools/securityoptions.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "unotools/startoptions.hxx" #include "svtools/statusbarcontroller.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hrc" -#include "svtools/style.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svdde.hxx" -#include "svtools/svstdarr.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hrc" +#include "svl/style.hxx" +#include "svl/svarray.hxx" +#include "svl/svdde.hxx" +#include "svl/svstdarr.hxx" #include "svtools/svtdata.hxx" -#include "svtools/svtools.hrc" -#include "svtools/syslocale.hxx" -#include "svtools/syslocaleoptions.hxx" -#include "svtools/szitem.hxx" +#include "svl/svtools.hrc" +#include "unotools/syslocale.hxx" +#include "unotools/syslocaleoptions.hxx" +#include "svl/szitem.hxx" #include "svtools/templatefoldercache.hxx" #include "svtools/toolboxcontroller.hxx" #include "svtools/transfer.hxx" #include "svtools/ttprops.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "unotools/undoopt.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/urlbmk.hxx" +#include "svl/urihelper.hxx" +#include "svl/urlbmk.hxx" #include "unotools/useroptions.hxx" #include "unotools/viewoptions.hxx" -#include "svtools/visitem.hxx" -#include "svtools/whiter.hxx" +#include "svl/visitem.hxx" +#include "svl/whiter.hxx" #include "unotools/workingsetoptions.hxx" -#include "svtools/zforlist.hxx" +#include "svl/zforlist.hxx" #include "toolkit/awt/vclxwindow.hxx" #include "toolkit/helper/convert.hxx" #include "tools/bigint.hxx" diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx index 39dde5cdc6..d30fd07cac 100644 --- a/sfx2/inc/sfx2/app.hxx +++ b/sfx2/inc/sfx2/app.hxx @@ -34,8 +34,8 @@ #include "sfx2/dllapi.h" #include "sal/types.h" #include -#include -#include +#include +#include #include #include #include @@ -94,7 +94,6 @@ class SfxModule; class SfxModuleArr_Impl; class Window; class INetURLObject; -class SfxMiscCfg; struct SfxConstant; struct SfxChildWinFactory; struct SfxMenuCtrlFactory; @@ -229,7 +228,6 @@ public: USHORT GetFreeIndex(); void ReleaseIndex(USHORT i); SfxEventConfiguration* GetEventConfig() const; - SfxMiscCfg* GetMiscConfig(); // Basic/Scripting static sal_Bool IsXScriptURL( const String& rScriptURL ); diff --git a/sfx2/inc/sfx2/appuno.hxx b/sfx2/inc/sfx2/appuno.hxx index bfdd1a2ea9..9a331ad46a 100644 --- a/sfx2/inc/sfx2/appuno.hxx +++ b/sfx2/inc/sfx2/appuno.hxx @@ -65,9 +65,9 @@ // something else header //____________________________________________________________________________________________________________________________________ #include -#include +#include #define _SVSTDARR_STRINGSDTOR -#include +#include #include //____________________________________________________________________________________________________________________________________ diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index e73b65afc1..984925d95e 100644 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -32,11 +32,11 @@ #define _CNTIDS_HRC #ifndef _CNTWIDS_HRC -#include +#include #endif #ifndef _SOLAR_HRC -#include +#include #endif // Slot-ID's ----------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/ctrlitem.hxx b/sfx2/inc/sfx2/ctrlitem.hxx index 01582644bc..2f40d77ac9 100644 --- a/sfx2/inc/sfx2/ctrlitem.hxx +++ b/sfx2/inc/sfx2/ctrlitem.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include +#include class SfxPoolItem; class SfxBindings; diff --git a/sfx2/inc/sfx2/dinfdlg.hxx b/sfx2/inc/sfx2/dinfdlg.hxx index ce84acd12a..3fb4174f57 100644 --- a/sfx2/inc/sfx2/dinfdlg.hxx +++ b/sfx2/inc/sfx2/dinfdlg.hxx @@ -37,15 +37,15 @@ #include #include #include -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include "tabdlg.hxx" diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index f126da5341..9a13785e20 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -37,7 +37,7 @@ #include #define _SVSTDARR_USHORTS -#include // SvUShorts +#include // SvUShorts #include #include diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx index ad63ad325c..38fba3e5b8 100644 --- a/sfx2/inc/sfx2/docfile.hxx +++ b/sfx2/inc/sfx2/docfile.hxx @@ -48,10 +48,10 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/sfx2/inc/sfx2/event.hxx b/sfx2/inc/sfx2/event.hxx index f0b5903be3..217e5910c1 100644 --- a/sfx2/inc/sfx2/event.hxx +++ b/sfx2/inc/sfx2/event.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include -#include +#include #include #include diff --git a/sfx2/inc/sfx2/evntconf.hxx b/sfx2/inc/sfx2/evntconf.hxx index d228f4e4d6..e9001ca642 100644 --- a/sfx2/inc/sfx2/evntconf.hxx +++ b/sfx2/inc/sfx2/evntconf.hxx @@ -38,7 +38,7 @@ #include #define _SVSTDARR_USHORTS -#include // SvUShorts +#include // SvUShorts #include #include @@ -46,7 +46,7 @@ #undef ITEMID_MACRO #endif #define ITEMID_MACRO SID_ATTR_MACROITEM -#include +#include class SfxMacroInfo; class SfxMacroInfoArr_Impl; diff --git a/sfx2/inc/sfx2/fcontnr.hxx b/sfx2/inc/sfx2/fcontnr.hxx index cfed48aa73..b22f1137d7 100644 --- a/sfx2/inc/sfx2/fcontnr.hxx +++ b/sfx2/inc/sfx2/fcontnr.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx index c536e7d966..210b0c4a5a 100644 --- a/sfx2/inc/sfx2/frame.hxx +++ b/sfx2/inc/sfx2/frame.hxx @@ -68,9 +68,9 @@ namespace com #include #include #include -#include +#include #include -#include +#include class SvBorder; class SfxWorkWindow; diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index 1ebf31042b..9de4ab3dc3 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -34,10 +34,10 @@ #include "sfx2/dllapi.h" #include -#include +#include #include #include -#include +#include #include class SvStream; diff --git a/sfx2/inc/sfx2/itemwrapper.hxx b/sfx2/inc/sfx2/itemwrapper.hxx index 738f1039bc..d7f05ae699 100644 --- a/sfx2/inc/sfx2/itemwrapper.hxx +++ b/sfx2/inc/sfx2/itemwrapper.hxx @@ -33,10 +33,10 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include -#include -#include -#include +#include +#include +#include +#include // ============================================================================ diff --git a/sfx2/inc/sfx2/linkmgr.hxx b/sfx2/inc/sfx2/linkmgr.hxx index de41985a07..bf79f78569 100644 --- a/sfx2/inc/sfx2/linkmgr.hxx +++ b/sfx2/inc/sfx2/linkmgr.hxx @@ -34,7 +34,7 @@ #include "sfx2/dllapi.h" #include #include -#include +#include class SfxObjectShell; diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx index 02327edd81..35db4e8cd2 100644 --- a/sfx2/inc/sfx2/macrconf.hxx +++ b/sfx2/inc/sfx2/macrconf.hxx @@ -35,7 +35,7 @@ #include "sal/types.h" #include #define _SVSTDARR_USHORTS -#include // SvUShorts +#include // SvUShorts #include class SfxMacroInfo; diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx index 9bb03415bd..c1a02a3855 100644 --- a/sfx2/inc/sfx2/macropg.hxx +++ b/sfx2/inc/sfx2/macropg.hxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include diff --git a/sfx2/inc/sfx2/msgpool.hxx b/sfx2/inc/sfx2/msgpool.hxx index 741f79008f..9b14354e17 100644 --- a/sfx2/inc/sfx2/msgpool.hxx +++ b/sfx2/inc/sfx2/msgpool.hxx @@ -36,7 +36,7 @@ #include #include -#include +#include class SfxInterface; class SfxSlot; diff --git a/sfx2/inc/sfx2/objitem.hxx b/sfx2/inc/sfx2/objitem.hxx index b4f359d9a3..98bb320569 100644 --- a/sfx2/inc/sfx2/objitem.hxx +++ b/sfx2/inc/sfx2/objitem.hxx @@ -32,7 +32,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include +#include #include diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index d9996b0d4b..32a242223a 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -58,7 +58,7 @@ //#if 0 // _SOLAR__PRIVATE #include //#endif -#include +#include #include #include #include diff --git a/sfx2/inc/sfx2/objuno.hxx b/sfx2/inc/sfx2/objuno.hxx index 74083423b1..03969bcebf 100644 --- a/sfx2/inc/sfx2/objuno.hxx +++ b/sfx2/inc/sfx2/objuno.hxx @@ -51,7 +51,7 @@ #include -#include +#include #include #include "sfxuno.hxx" diff --git a/sfx2/inc/sfx2/querystatus.hxx b/sfx2/inc/sfx2/querystatus.hxx index 9f7e0e910a..e205f67d7b 100644 --- a/sfx2/inc/sfx2/querystatus.hxx +++ b/sfx2/inc/sfx2/querystatus.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include +#include #include #include #include diff --git a/sfx2/inc/sfx2/request.hxx b/sfx2/inc/sfx2/request.hxx index 5ec41cd73c..5aba53bfd6 100644 --- a/sfx2/inc/sfx2/request.hxx +++ b/sfx2/inc/sfx2/request.hxx @@ -33,8 +33,8 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include -#include +#include +#include #include #include diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index ce6b09adbb..45669204cf 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -33,11 +33,11 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include +#include #endif #ifndef _MEMBERID_HRC -#include +#include #endif #define RID_GROUPS_OFFSET 32000 diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index e6d68889e4..93a7d1fb37 100644 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -103,7 +103,7 @@ // include of my own project //________________________________________________________________________________________________________ -#include +#include //________________________________________________________________________________________________________ // defines diff --git a/sfx2/inc/sfx2/sfxhtml.hxx b/sfx2/inc/sfx2/sfxhtml.hxx index 811db2f4db..ae8e3d0ea0 100644 --- a/sfx2/inc/sfx2/sfxhtml.hxx +++ b/sfx2/inc/sfx2/sfxhtml.hxx @@ -36,7 +36,7 @@ #include "sal/types.h" #include #include -#include +#include class ImageMap; diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 09a9849d7c..6ce92380ee 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SOLAR_HRC -#include +#include #endif #define SID_SFX_START 5000 diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx index 57f3beb7dd..fc0c800071 100644 --- a/sfx2/inc/sfx2/sfxstatuslistener.hxx +++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx @@ -33,7 +33,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include +#include #include #include #include diff --git a/sfx2/inc/sfx2/shell.hxx b/sfx2/inc/sfx2/shell.hxx index 154cef1257..ba16f98f2c 100644 --- a/sfx2/inc/sfx2/shell.hxx +++ b/sfx2/inc/sfx2/shell.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/inc/sfx2/srchitem.hxx b/sfx2/inc/sfx2/srchitem.hxx index 373c0b4e85..b8df62e0c6 100644 --- a/sfx2/inc/sfx2/srchitem.hxx +++ b/sfx2/inc/sfx2/srchitem.hxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -112,6 +112,7 @@ public: // ConfigItem virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames ); + virtual void Commit(); sal_uInt16 GetCommand() const { return nCommand; } void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx index ca312124e7..050b135486 100644 --- a/sfx2/inc/sfx2/tabdlg.hxx +++ b/sfx2/inc/sfx2/tabdlg.hxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #if ENABLE_LAYOUT diff --git a/sfx2/inc/sfx2/viewfrm.hxx b/sfx2/inc/sfx2/viewfrm.hxx index b551a4942f..89bd00fc5d 100644 --- a/sfx2/inc/sfx2/viewfrm.hxx +++ b/sfx2/inc/sfx2/viewfrm.hxx @@ -33,12 +33,12 @@ #include "sal/config.h" #include "sfx2/dllapi.h" #include "sal/types.h" -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index ae45545cba..696be7b565 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 9d135df393..4d5e4c2218 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_SORGITM_HXX #define _SFX_SORGITM_HXX -#include +#include // class SfxScriptOrganizerItem --------------------------------------------- diff --git a/sfx2/inc/stbitem.hxx b/sfx2/inc/stbitem.hxx index 6a32a70748..c3ee01bd5f 100644 --- a/sfx2/inc/stbitem.hxx +++ b/sfx2/inc/stbitem.hxx @@ -32,7 +32,7 @@ #include "sal/config.h" #include "sfx2/dllapi.h" -#include +#include #include //------------------------------------------------------------------ diff --git a/sfx2/inc/tplpitem.hxx b/sfx2/inc/tplpitem.hxx index 46b437b0f2..8c721391d7 100644 --- a/sfx2/inc/tplpitem.hxx +++ b/sfx2/inc/tplpitem.hxx @@ -34,7 +34,7 @@ #include "sfx2/dllapi.h" #include #include -#include +#include class SFX2_DLLPUBLIC SfxTemplateItem: public SfxFlagItem { diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index c72d792244..c75033ae71 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -45,19 +45,19 @@ #include #include #include -#include +#include #ifndef _SOUND_HXX //autogen #include #endif -#include -#include +#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif #include #include -#include +#include #include #include #include @@ -65,7 +65,7 @@ #endif #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include @@ -153,8 +153,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 194c2b6afd..36b6cd94f8 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -36,15 +36,15 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 28f2fa072a..fd2afddcb3 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -46,24 +46,24 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #define _SVSTDARR_STRINGS -#include +#include #include #include #include //#include //#include -#include +#include #include #include @@ -79,7 +79,6 @@ #include #include #include -#include #include #include @@ -1075,10 +1074,3 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSync IMPL_OBJHINT( SfxStringHint, String ) -SfxMiscCfg* SfxApplication::GetMiscConfig() -{ - if ( !pAppData_Impl->pMiscConfig ) - pAppData_Impl->pMiscConfig = new SfxMiscCfg; - - return pAppData_Impl->pMiscConfig; -} diff --git a/sfx2/source/appl/appchild.cxx b/sfx2/source/appl/appchild.cxx index dec26b4f0c..da7b56c97b 100644 --- a/sfx2/source/appl/appchild.cxx +++ b/sfx2/source/appl/appchild.cxx @@ -33,8 +33,8 @@ #ifndef GCC #endif -#include -#include +#include +#include #include #include "appdata.hxx" diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index d04ebcf822..8f24520a4b 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -33,17 +33,17 @@ #include #include #ifndef _INETSTRM_HXX //autogen -#include +#include #endif -#include +#include #define _SVSTDARR_STRINGS -#include +#include #include #include #include -#include +#include #include #include #include "comphelper/processfactory.hxx" @@ -109,7 +109,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* pApp ) : pEventConfig(0), pDisabledSlotList( 0 ), pSecureURLs(0), - pMiscConfig(0), pSaveOptions( 0 ), pUndoOptions( 0 ), pHelpOptions( 0 ), diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 0386129c6d..1c282bafd1 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -31,12 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include #include diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 34fc074e52..5345a050aa 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include @@ -46,9 +46,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index 96cf2a70e7..f4e3dea030 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -37,12 +37,11 @@ #include #include -#include #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx index 9a4883282b..cf219f6d26 100644 --- a/sfx2/source/appl/appmisc.cxx +++ b/sfx2/source/appl/appmisc.cxx @@ -36,10 +36,10 @@ #include #endif #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index c0065bea75..e6e0c4bdac 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -64,16 +64,16 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -95,7 +95,7 @@ #include #include #include -#include +#include #include "objshimp.hxx" #include "openflag.hxx" #include @@ -112,7 +112,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::beans; diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 4dfdbb90b2..fcfa2c50ef 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -36,14 +36,14 @@ #ifdef WIN #define _TL_LANG_SPECIAL #endif -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index cc70813d53..48b976b312 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -62,7 +62,7 @@ #ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ #include #endif -#include +#include #include #ifndef _UNOTOOLS_CONFIGMGR_HXX_ @@ -71,10 +71,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 81d198412a..b623365c5a 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -43,8 +43,8 @@ #include "sfx2/dllapi.h" #include -#include -#include +#include +#include #include #include @@ -60,12 +60,12 @@ #endif #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 75df926968..a74e9def57 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -53,7 +53,7 @@ #include #include -#include +#include #include #define DDELINK_COLD 0 diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index de1c524ec7..4306340dfc 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -47,7 +47,7 @@ #define _SVSTDARR_STRINGSDTOR -#include +#include namespace sfx2 diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 5892f99781..f3565bdb55 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 41a139d19b..9b7a92fff0 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -50,7 +50,7 @@ #include -#include +#include using namespace ::com::sun::star::uno; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index baaac7e57a..7421330cf9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -74,7 +74,7 @@ #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_ULONGSSORT -#include +#include #include #include @@ -237,6 +237,8 @@ public: ~SfxHelpOptions_Impl(); BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; } + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); }; static Sequence< ::rtl::OUString > GetPropertyNames() @@ -309,6 +311,15 @@ SfxHelpOptions_Impl::~SfxHelpOptions_Impl() delete m_pIds; } + +void SfxHelpOptions_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + +void SfxHelpOptions_Impl::Commit() +{ +} + // class SfxHelp_Impl ---------------------------------------------------- class SfxHelp_Impl diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 8984347187..b192101b32 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -36,9 +36,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 5e2bb23e93..fc64b7243d 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -57,12 +57,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifndef _SFXEITEM_HXX //autogen -#include +#include #endif #include #include diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 82bb158301..c305aa862d 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -60,12 +60,12 @@ #include #endif #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -109,9 +109,9 @@ using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::document; using namespace ::com::sun::star::beans; using namespace ::vos; -#include +#include #include -#include +#include #include "sfxhelp.hxx" #include "sfxbasic.hxx" diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index f1071be264..bae22d228f 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -38,7 +38,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS -#include +#include #include diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index d93f99bda7..5371f0697d 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" #ifndef _INETDEF_HXX -#include +#include #endif #include "svtools/htmlkywd.hxx" @@ -40,7 +40,7 @@ #include #include -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include #include diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 06791f4435..97dd4da66f 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -39,7 +39,7 @@ #include #endif -#include +#include #include // wg. nRescheduleLocks diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index eba014f892..59c25f1910 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -46,9 +46,9 @@ #include #ifndef _SVSTDARR_ULONGS_DECL #define _SVSTDARR_ULONGS -#include +#include #endif -#include +#include #include #include diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index be222b98f1..385260dce6 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -34,7 +34,7 @@ #ifndef _SV_RESARY_HXX #include #endif -#include +#include #include #include #include diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 02efe0aeba..5feac51002 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -32,13 +32,13 @@ #include "precompiled_sfx2.hxx" #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 71bfbbb5c0..a4fe8e70db 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index d76697b6c5..84414e164f 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -33,14 +33,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifndef _SFXEITEM_HXX //autogen -#include +#include #endif -#include +#include #ifndef _WRKWIN_HXX //autogen #include #endif @@ -50,7 +50,7 @@ #include // wg. bsearch #define _SVSTDARR_ULONGS -#include +#include #include #include #include diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index 84c9f7feb5..baee95519f 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -35,7 +35,7 @@ #ifndef _SBX_HXX //autogen #include #endif -#include +#include #include #include #ifndef _BASIC_SBUNO_HXX diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index abe1c78620..46e961b71d 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -30,8 +30,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include -#include +#include +#include #ifndef GCC #endif diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index a7448152ef..7a66ad2a33 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 80de021867..c00aa9397c 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -39,10 +39,10 @@ #include #include #include -#include +#include #ifndef _ARGS_HXX //autogen -#include +#include #endif #include @@ -51,7 +51,7 @@ #ifndef GCC #endif -#include +#include #include #include diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index 4fe13466f4..ee054cf1f6 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 0518435434..bfd280c786 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/control/srchitem.cxx b/sfx2/source/control/srchitem.cxx index 62c9e22fac..22b1342244 100644 --- a/sfx2/source/control/srchitem.cxx +++ b/sfx2/source/control/srchitem.cxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include #ifndef GCC @@ -359,6 +359,9 @@ void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & ) SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() ); } +void SvxSearchItem::Commit() +{ +} void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal ) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index 795fb5e9be..39c34ed204 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -46,10 +46,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #ifndef GCC diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 11e9fd3d77..3b8fd4cf5c 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -32,13 +32,13 @@ #include "precompiled_sfx2.hxx" #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index e715063509..432e2ed173 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index df3d4222f1..7f55a6070d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -32,12 +32,12 @@ #include "precompiled_sfx2.hxx" #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index b10283c849..6212b887fc 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include +#include #include #include diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5c57b91c84..28b1dd24cf 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -73,15 +73,15 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 09ddcfa868..abcd3125a1 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -41,7 +41,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include diff --git a/sfx2/source/dialog/itemconnect.cxx b/sfx2/source/dialog/itemconnect.cxx index ddf97257bc..add294746a 100644 --- a/sfx2/source/dialog/itemconnect.cxx +++ b/sfx2/source/dialog/itemconnect.cxx @@ -34,7 +34,7 @@ #include #include -#include +#include // ============================================================================ diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index c44765deea..3abfb114a8 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -73,8 +73,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 24d08ee3e4..5a69e4e2fe 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -37,9 +37,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #ifndef GCC #endif @@ -57,7 +57,7 @@ #include "mgetempl.hrc" #ifndef _SFX_STYLE_HRC -#include +#include #endif // SfxManageStyleSheetPage ----------------------------------------------- diff --git a/sfx2/source/dialog/newstyle.cxx b/sfx2/source/dialog/newstyle.cxx index 192f5917f3..642c87d75a 100644 --- a/sfx2/source/dialog/newstyle.cxx +++ b/sfx2/source/dialog/newstyle.cxx @@ -32,7 +32,7 @@ #include "precompiled_sfx2.hxx" // INCLUDE --------------------------------------------------------------- -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 49fc373fda..c73874f646 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "printopt.hrc" diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index bb9ad7b9a5..fc95e472a8 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx index dfb7076089..bedb46152b 100644 --- a/sfx2/source/dialog/styledlg.cxx +++ b/sfx2/source/dialog/styledlg.cxx @@ -32,8 +32,8 @@ #include "precompiled_sfx2.hxx" // include --------------------------------------------------------------- -#include -#include +#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 6ddc4bb7d2..51a3ce757a 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -37,7 +37,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #include "appdata.hxx" #include "sfxtypes.hxx" diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 2cc7b52d25..11eca63637 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -34,14 +34,14 @@ #ifndef _MENU_HXX //autogen #include #endif -#include -#include -#include +#include +#include +#include #ifndef GCC #endif #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include #include diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index 03103837b2..fa0e93d1d0 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -33,7 +33,7 @@ // INCLUDE --------------------------------------------------------------- -#include +#include #include #ifndef GCC diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index f6e5602e44..fe75d4d0c1 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -34,17 +34,17 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #define _SVSTDARR_STRINGSDTOR -#include +#include #include "versdlg.hrc" #include "versdlg.hxx" diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index 3f8ab1ae71..c914d9fe29 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -30,7 +30,7 @@ #include #include "doc.hrc" #define __RSC -#include +#include //#include // ----------------------------------------------------------------------- diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index d6a57d4129..a318cbeb36 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -90,19 +90,19 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include // SvKeyValue #include #include #define _SVSTDARR_ULONGS #define _SVSTDARR_STRINGSDTOR -#include +#include #include @@ -123,7 +123,7 @@ using namespace ::com::sun::star::io; #include #include #include -#include +#include #include #include #include @@ -134,7 +134,7 @@ using namespace ::com::sun::star::io; #include #include #include -#include +#include #include "opostponedtruncationstream.hxx" #include "helper.hxx" diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 5e2f3776d8..629c54a1dc 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -48,13 +48,13 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define _SVSTDARR_STRINGSDTOR -#include +#include using namespace ::com::sun::star::lang; using namespace ::com::sun::star::ui::dialogs; diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx index 40fafa0b16..a0258f2e8c 100644 --- a/sfx2/source/doc/doctdlg.cxx +++ b/sfx2/source/doc/doctdlg.cxx @@ -34,7 +34,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index ea0eced3d2..e18ec15f88 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -44,9 +44,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -81,7 +81,7 @@ #endif #include #define _SVSTDARR_STRINGSDTOR -#include +#include static const char cDelim = ':'; BOOL SfxOrganizeListBox_Impl::bDropMoveOk = TRUE; diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 3db8bf61ed..2cf885323c 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 6d0a885747..de934f5548 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -64,8 +64,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 726e0bbfc5..bcef29a045 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -37,8 +37,8 @@ #ifndef _SVMEDIT_HXX #include #endif -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index c2c4ee717f..7797bd37ef 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -41,15 +41,15 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index d6cce3c0fe..bfc2d96310 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -32,12 +32,12 @@ #include "precompiled_sfx2.hxx" #ifndef _INETMSG_HXX //autogen -#include +#include #endif #include -#include -#include -#include +#include +#include +#include #include // SvKeyValue #include #include @@ -115,8 +115,8 @@ using namespace ::com::sun::star::container; #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f9c5148754..cf6310bd2e 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -54,10 +54,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 23ada65f9a..e293fc3673 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -34,9 +34,9 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/objuno.cxx b/sfx2/source/doc/objuno.cxx index e9e37a44c5..367325208d 100644 --- a/sfx2/source/doc/objuno.cxx +++ b/sfx2/source/doc/objuno.cxx @@ -59,7 +59,7 @@ #include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 596aedef70..8f80ffbe1b 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -54,12 +54,12 @@ #include #endif #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include @@ -82,9 +82,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index ca0e28d322..957c245fb3 100755 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -43,10 +43,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 25d2d964e9..f87a65d3f2 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -73,9 +73,9 @@ #include #include // can be removed when this is a "real" service #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx index a5f69a2e9c..a76f0d0bbe 100644 --- a/sfx2/source/explorer/nochaos.cxx +++ b/sfx2/source/explorer/nochaos.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include -#include -#include +#include +#include +#include #include #include diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 402ca3bdae..555b2cc498 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include "rtl/ref.hxx" @@ -58,7 +58,6 @@ class SfxFilterMatcher; class SfxCancelManager; class SfxStatusDispatcher; class SfxDdeTriggerTopic_Impl; -class SfxMiscCfg; class SfxDocumentTemplates; class SfxFrameArr_Impl; class SvtSaveOptions; @@ -122,7 +121,6 @@ public: SfxEventConfiguration* pEventConfig; SvUShorts* pDisabledSlotList; SvStrings* pSecureURLs; - SfxMiscCfg* pMiscConfig; SvtSaveOptions* pSaveOptions; SvtUndoOptions* pUndoOptions; SvtHelpOptions* pHelpOptions; diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx index ee53c7dd66..73c9092ff5 100644 --- a/sfx2/source/inc/applet.hxx +++ b/sfx2/source/inc/applet.hxx @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 1593ed3a58..e6a2c96608 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -57,7 +57,7 @@ #include #include -#include +#include #include //-------------------------------------------------------------------------------------------------------- diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index 8e7643975d..eae960fc7a 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -32,7 +32,7 @@ // include ------------------------------------------------------------------ -#include +#include // Help-Ids ----------------------------------------------------------------- diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx index 332aaa171f..f67ec1f591 100644 --- a/sfx2/source/inc/iframe.hxx +++ b/sfx2/source/inc/iframe.hxx @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx index 6c545e2fb2..f2dbfbdb03 100644 --- a/sfx2/source/inc/plugin.hxx +++ b/sfx2/source/inc/plugin.hxx @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index 5097112f6a..618bb0b2c1 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 55e7a317d2..f7f7740264 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -41,12 +41,12 @@ class SfxTemplateControllerItem; #ifndef _LSTBOX_HXX //autogen #include #endif -#include +#include #include -#include +#include #define _SVSTDARR_USHORTS -#include // SvUShorts +#include // SvUShorts #include #include diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 5e2436db51..f939ac775d 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -32,7 +32,7 @@ #define _SFXVIRTMENU_HXX -#include +#include #include #include "mnucfga.hxx" diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index dc231c1af7..8735e24b90 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -42,7 +42,7 @@ #include #define _SVSTDARR_USHORTS -#include // SvUShorts +#include // SvUShorts #include #include diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index beae0e9a1a..27ce878499 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -40,11 +40,11 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include @@ -57,8 +57,8 @@ #endif #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/layout/sfxtabdialog.cxx b/sfx2/source/layout/sfxtabdialog.cxx index 0478fb0ea9..92454ae62f 100644 --- a/sfx2/source/layout/sfxtabdialog.cxx +++ b/sfx2/source/layout/sfxtabdialog.cxx @@ -37,7 +37,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #include "appdata.hxx" #include "sfxtypes.hxx" diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 1974c4e59a..b4bab6168b 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -51,8 +51,8 @@ #include #endif #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 4200054df0..356582c7ac 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -60,7 +60,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #include #include "virtmenu.hxx" diff --git a/sfx2/source/menu/objmnctl.cxx b/sfx2/source/menu/objmnctl.cxx index 27b500d7ff..85829a5338 100644 --- a/sfx2/source/menu/objmnctl.cxx +++ b/sfx2/source/menu/objmnctl.cxx @@ -38,7 +38,7 @@ #include #endif #ifndef _SXSTRITEM_HXX //autogen -#include +#include #endif #ifndef GCC #endif diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 5c42c0ef42..86f573097f 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index ae1453f3fd..c1f6ee3767 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -42,7 +42,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 6ceb8803de..7aa9ac545e 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include +#include #ifndef GCC #endif #include @@ -57,9 +57,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include #endif diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 905004bcd8..33e8d69c0c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -58,12 +58,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index e5d7ca0693..9b6d39b195 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -43,12 +43,12 @@ #ifndef _MENU_HXX //autogen #include #endif -#include +#include #ifndef _SPLITWIN_HXX //autogen #include #endif -#include -#include +#include +#include #ifndef _TOOLKIT_UNOHLP_HXX #include #endif diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index fa0a6fe75d..b439dca4ff 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -62,10 +62,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sfx2/source/view/impframe.cxx b/sfx2/source/view/impframe.cxx index 5c22507979..d57771c1ae 100644 --- a/sfx2/source/view/impframe.cxx +++ b/sfx2/source/view/impframe.cxx @@ -36,7 +36,7 @@ #include "impframe.hxx" -#include +#include #include #include diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index de5995dfb8..ff40ec6f20 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -31,7 +31,7 @@ #ifndef _SFX_IMPFRAME_HXX #define _SFX_IMPFRAME_HXX -#include +#include #include #include // SvBorder diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 18fe96ebb0..1a8754d651 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -72,7 +72,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/view/prnmon.cxx b/sfx2/source/view/prnmon.cxx index ba397cb672..b840c40a25 100644 --- a/sfx2/source/view/prnmon.cxx +++ b/sfx2/source/view/prnmon.cxx @@ -40,7 +40,7 @@ #include #include -#include +#include #ifndef GCC #endif diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx index 0ed183c6fc..5d03bb3e61 100644 --- a/sfx2/source/view/topfrm.cxx +++ b/sfx2/source/view/topfrm.cxx @@ -60,14 +60,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 3b6f43f358..577c9a8b07 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -45,12 +45,12 @@ #include #endif #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif @@ -90,7 +90,7 @@ #include #include #include -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 8da29780c7..b9cb144f27 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif @@ -43,10 +43,10 @@ #ifndef _SV_PRNSETUP_HXX //autogen #include #endif -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 43564e1488..71007a0d97 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -30,12 +30,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sfx2.hxx" -#include -#include -#include +#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/svx/inc/bolnitem.hxx b/svx/inc/bolnitem.hxx index 9a05a6910e..117b0d24a4 100644 --- a/svx/inc/bolnitem.hxx +++ b/svx/inc/bolnitem.hxx @@ -34,7 +34,7 @@ -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/bulitem.hxx b/svx/inc/bulitem.hxx index 4f2b665408..050c92f6ee 100644 --- a/svx/inc/bulitem.hxx +++ b/svx/inc/bulitem.hxx @@ -66,7 +66,7 @@ #define VALID_STYLE 0x0040 #define VALID_PREVTEXT 0x0080 #define VALID_FOLLOWTEXT 0x0100 -#include +#include #include #include diff --git a/svx/inc/charhiddenitem.hxx b/svx/inc/charhiddenitem.hxx index 1cff33a509..739bde77eb 100644 --- a/svx/inc/charhiddenitem.hxx +++ b/svx/inc/charhiddenitem.hxx @@ -32,8 +32,8 @@ // include --------------------------------------------------------------- -#include -#include +#include +#include #include "svx/svxdllapi.h" // class SvxCharHiddenItem ------------------------------------------------- diff --git a/svx/inc/chrtitem.hxx b/svx/inc/chrtitem.hxx index d1ba824d6d..6a53f92fde 100644 --- a/svx/inc/chrtitem.hxx +++ b/svx/inc/chrtitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" //------------------------------------------------------------------------ diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx index 773b84773e..40563867d6 100644 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/clipboardctl.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/clipfmtitem.hxx index f77f9dd09d..8c9f7a60d4 100644 --- a/svx/inc/clipfmtitem.hxx +++ b/svx/inc/clipfmtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include "svx/svxdllapi.h" // class SvxClipboardFmtItem ---------------------------------------------- diff --git a/svx/inc/dlgutil.hxx b/svx/inc/dlgutil.hxx index 8b840a44cf..380464c06e 100644 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/dlgutil.hxx @@ -34,8 +34,8 @@ #ifndef _FIELD_HXX #include #endif -#include -#include +#include +#include #include "svx/svxdllapi.h" // macro ----------------------------------------------------------------- diff --git a/svx/inc/drawitem.hxx b/svx/inc/drawitem.hxx index 6acf482ef5..f0fd60cc7f 100644 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/drawitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/editund2.hxx b/svx/inc/editund2.hxx index 2f294295a3..df48708e34 100644 --- a/svx/inc/editund2.hxx +++ b/svx/inc/editund2.hxx @@ -32,7 +32,7 @@ #define _EDITUND2_HXX #include "svx/svxdllapi.h" -#include +#include class ImpEditEngine; diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/extrusioncontrols.hxx index b2d03ec397..54d9fef468 100644 --- a/svx/inc/extrusioncontrols.hxx +++ b/svx/inc/extrusioncontrols.hxx @@ -31,7 +31,7 @@ #define _SVX_EXTRUSION_CONTROLS_HXX #include -#include +#include #include #include #ifndef _SV_BUTTON_HXX diff --git a/svx/inc/flstitem.hxx b/svx/inc/flstitem.hxx index 9bb53a2942..fccbc48fb5 100644 --- a/svx/inc/flstitem.hxx +++ b/svx/inc/flstitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 0d00d17f39..540fb9e59f 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -31,7 +31,7 @@ #define _SVX_FMHELP_HRC // include ----------------------------------------------------------- -#include +#include // in solar.hrc //#define HID_FORMS_START (HID_LIB_START+4000) diff --git a/svx/inc/fontitem.hxx b/svx/inc/fontitem.hxx index 82efbf7dbe..b83f593bb9 100644 --- a/svx/inc/fontitem.hxx +++ b/svx/inc/fontitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _FONT_HXX //autogen #include diff --git a/svx/inc/fwdtitem.hxx b/svx/inc/fwdtitem.hxx index 7f5367a47a..12a4662222 100644 --- a/svx/inc/fwdtitem.hxx +++ b/svx/inc/fwdtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include +#include // class SvxFontWidthItem ----------------------------------------------- diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index b1e619c218..b86057e353 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include "galbrws.hxx" diff --git a/svx/inc/galctrl.hxx b/svx/inc/galctrl.hxx index 5611332119..5f1aae5e30 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/galctrl.hxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/inc/galdlg.hxx b/svx/inc/galdlg.hxx index 07570c76d8..be86dfb13a 100644 --- a/svx/inc/galdlg.hxx +++ b/svx/inc/galdlg.hxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/inc/gallery1.hxx b/svx/inc/gallery1.hxx index 6c508c2311..454ef9f20c 100644 --- a/svx/inc/gallery1.hxx +++ b/svx/inc/gallery1.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "svx/svxdllapi.h" #include "gallery.hrc" diff --git a/svx/inc/galmisc.hxx b/svx/inc/galmisc.hxx index d19fac542e..53ee747d5b 100644 --- a/svx/inc/galmisc.hxx +++ b/svx/inc/galmisc.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include "galobj.hxx" diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx index 2ff2d26d60..20279338e9 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/galtheme.hxx @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include "galobj.hxx" diff --git a/svx/inc/grafctrl.hxx b/svx/inc/grafctrl.hxx index 78b24e8d15..82d1c31a4a 100644 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/grafctrl.hxx @@ -31,8 +31,8 @@ #ifndef _SVX_GRAFCTRL_HXX #define _SVX_GRAFCTRL_HXX -#include -#include +#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 22d3175fa1..675acefa1e 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -31,7 +31,7 @@ #define _SVX_HELPID_HRC // include --------------------------------------------------------------- -#include +#include // Help-Ids -------------------------------------------------------------- diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/hlnkitem.hxx index 70541df263..30f90f7c7b 100644 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/hlnkitem.hxx @@ -31,9 +31,9 @@ #define _SVX_HLNKITEM_HXX #include -#include +#include #include -#include +#include #include "svx/svxdllapi.h" #define HYPERDLG_EVENT_MOUSEOVER_OBJECT 0x0001 diff --git a/svx/inc/htmlcfg.hxx b/svx/inc/htmlcfg.hxx index 785bddde20..98b114085d 100644 --- a/svx/inc/htmlcfg.hxx +++ b/svx/inc/htmlcfg.hxx @@ -61,7 +61,8 @@ public: SvxHtmlOptions(); ~SvxHtmlOptions(); - virtual void Commit(); + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); USHORT GetFontSize(USHORT nPos) const; void SetFontSize(USHORT nPos, USHORT nSize); diff --git a/svx/inc/linectrl.hxx b/svx/inc/linectrl.hxx index e3d3a5dfbb..bb13dfc0e4 100644 --- a/svx/inc/linectrl.hxx +++ b/svx/inc/linectrl.hxx @@ -32,7 +32,7 @@ #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/nlbkitem.hxx b/svx/inc/nlbkitem.hxx index 57e48f6492..3b01a4c374 100644 --- a/svx/inc/nlbkitem.hxx +++ b/svx/inc/nlbkitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" // class SvxNoLinebreakItem ---------------------------------------------- diff --git a/svx/inc/ofaitem.hxx b/svx/inc/ofaitem.hxx index 8be5742c6d..a16e3316b0 100644 --- a/svx/inc/ofaitem.hxx +++ b/svx/inc/ofaitem.hxx @@ -32,7 +32,7 @@ // include ---------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" // class OfaPtrItem ------------------------------------------------------ diff --git a/svx/inc/opaqitem.hxx b/svx/inc/opaqitem.hxx index 61bae7ff80..2d8241db3b 100644 --- a/svx/inc/opaqitem.hxx +++ b/svx/inc/opaqitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" class SvXMLUnitConverter; diff --git a/svx/inc/optgrid.hxx b/svx/inc/optgrid.hxx index c219a9e542..fb17b4b5c8 100644 --- a/svx/inc/optgrid.hxx +++ b/svx/inc/optgrid.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include #include #include diff --git a/svx/inc/optitems.hxx b/svx/inc/optitems.hxx index 4d6b6a0040..0d55fa4638 100644 --- a/svx/inc/optitems.hxx +++ b/svx/inc/optitems.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index d118cfbb40..aea1b42c8f 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -753,29 +753,29 @@ #include #include "svtools/FilterConfigItem.hxx" #include "svtools/accessibilityoptions.hxx" -#include "svtools/adrparse.hxx" +#include "unotools/adrparse.hxx" #include "svtools/apearcfg.hxx" -#include "svtools/brdcst.hxx" +#include "svl/brdcst.hxx" #include "unotools/cacheoptions.hxx" -#include "svtools/cancel.hxx" -#include "svtools/cjkoptions.hxx" +#include "svl/cancel.hxx" +#include "svl/cjkoptions.hxx" #include "unotools/cmdoptions.hxx" -#include "svtools/cntwall.hxx" +#include "svl/cntwall.hxx" #include "svtools/colorcfg.hxx" -#include "svtools/ctloptions.hxx" +#include "svl/ctloptions.hxx" #include "unotools/defaultoptions.hxx" #include "unotools/dynamicmenuoptions.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "unotools/eventcfg.hxx" #include "unotools/extendedsecurityoptions.hxx" -#include "svtools/filenotation.hxx" -#include "svtools/flagitem.hxx" +#include "svl/filenotation.hxx" +#include "svl/flagitem.hxx" #include "unotools/fltrcfg.hxx" #include "unotools/fontoptions.hxx" #include "svtools/fontsubstconfig.hxx" #include "svtools/helpopt.hxx" -#include "svtools/hint.hxx" +#include "svl/hint.hxx" #include "svtools/htmlkywd.hxx" #include "svtools/htmltokn.h" #include "svtools/imagemgr.hxx" @@ -785,69 +785,69 @@ #include "svtools/imaprect.hxx" #include "svtools/inetimg.hxx" #include "unotools/inetoptions.hxx" -#include "svtools/intitem.hxx" -#include "svtools/isethint.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemprop.hxx" -#include "svtools/itemset.hxx" +#include "svl/intitem.hxx" +#include "svl/isethint.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemprop.hxx" +#include "svl/itemset.hxx" #include "unotools/javaoptions.hxx" -#include "svtools/languageoptions.hxx" +#include "svl/languageoptions.hxx" #include "unotools/lingucfg.hxx" #include "unotools/linguprops.hxx" -#include "svtools/lngmisc.hxx" +#include "svl/lngmisc.hxx" #include "svtools/localresaccess.hxx" -#include "svtools/lstner.hxx" -#include "svtools/macitem.hxx" +#include "svl/lstner.hxx" +#include "svl/macitem.hxx" #include "svtools/menuoptions.hxx" -#include "svtools/metitem.hxx" -#include "svtools/misccfg.hxx" +#include "svl/metitem.hxx" +#include "unotools/misccfg.hxx" #include "svtools/miscopt.hxx" #include "unotools/moduleoptions.hxx" -#include "svtools/numuno.hxx" +#include "svl/numuno.hxx" #include "unotools/optionsdlg.hxx" #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/pickerhelper.hxx" -#include "svtools/poolitem.hxx" +#include "svl/pickerhelper.hxx" +#include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" -#include "svtools/ptitem.hxx" -#include "svtools/rectitem.hxx" -#include "svtools/rngitem.hxx" +#include "svl/ptitem.hxx" +#include "svl/rectitem.hxx" +#include "svl/rngitem.hxx" #include "svtools/rtfkeywd.hxx" #include "svtools/rtfout.hxx" #include "svtools/rtftoken.h" #include "unotools/saveopt.hxx" #include "unotools/searchopt.hxx" #include "unotools/securityoptions.hxx" -#include "svtools/sfontitm.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/sfontitm.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" #include "unotools/sourceviewconfig.hxx" #include "unotools/startoptions.hxx" #include "svtools/stdmenu.hxx" #include "svtools/stringtransfer.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/syslocaleoptions.hxx" -#include "svtools/szitem.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hxx" +#include "svl/svarray.hxx" +#include "svl/svstdarr.hxx" +#include "unotools/syslocaleoptions.hxx" +#include "svl/szitem.hxx" #include "svtools/textdata.hxx" #include "svtools/transfer.hxx" #include "svtools/txtcmp.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "unotools/undoopt.hxx" #include "svtools/unoevent.hxx" #include "svtools/unoimap.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/urlbmk.hxx" +#include "svl/urihelper.hxx" +#include "svl/urlbmk.hxx" #include "unotools/useroptions.hxx" #include "unotools/viewoptions.hxx" -#include "svtools/visitem.hxx" -#include "svtools/whiter.hxx" +#include "svl/visitem.hxx" +#include "svl/whiter.hxx" #include "sys/stat.h" #include "sys/types.h" #include "toolkit/awt/vclxdevice.hxx" diff --git a/svx/inc/pgrditem.hxx b/svx/inc/pgrditem.hxx index f0a15bc7f3..c6871a7e16 100644 --- a/svx/inc/pgrditem.hxx +++ b/svx/inc/pgrditem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" // class SvxParaGridItem ------------------------------------------------- diff --git a/svx/inc/postattr.hxx b/svx/inc/postattr.hxx index 7771e5ba73..0b1cf0c12f 100644 --- a/svx/inc/postattr.hxx +++ b/svx/inc/postattr.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" // class SvxPostItAuthorItem --------------------------------------------- diff --git a/svx/inc/prntitem.hxx b/svx/inc/prntitem.hxx index 8f510cf8ba..ab94837ffe 100644 --- a/svx/inc/prntitem.hxx +++ b/svx/inc/prntitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/protitem.hxx b/svx/inc/protitem.hxx index fc8ddbab23..4a9b3e3765 100644 --- a/svx/inc/protitem.hxx +++ b/svx/inc/protitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- -#include +#include #include "svx/svxdllapi.h" class SvXMLUnitConverter; diff --git a/svx/inc/rotmodit.hxx b/svx/inc/rotmodit.hxx index 6314e3ba00..1fc02c558d 100644 --- a/svx/inc/rotmodit.hxx +++ b/svx/inc/rotmodit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_ROTMODIT_HXX #define _SVX_ROTMODIT_HXX -#include +#include #include "svx/svxdllapi.h" //---------------------------------------------------------------------------- diff --git a/svx/inc/rulritem.hxx b/svx/inc/rulritem.hxx index 7237316d4f..b9186a61db 100644 --- a/svx/inc/rulritem.hxx +++ b/svx/inc/rulritem.hxx @@ -34,7 +34,7 @@ #include -#include +#include #include "svx/svxdllapi.h" // class SvxLongLRSpaceItem ---------------------------------------------- diff --git a/svx/inc/srchdlg.hxx b/svx/inc/srchdlg.hxx index 1df6e3da9f..411d2f941e 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/srchdlg.hxx @@ -57,9 +57,9 @@ #endif #include #include -#include +#include #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index 51400570db..05b44e3a8a 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #include #include diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx index 818c3c8596..f82c492c46 100644 --- a/svx/inc/svx/adjitem.hxx +++ b/svx/inc/svx/adjitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx index 54e7785b81..059f301efe 100644 --- a/svx/inc/svx/akrnitem.hxx +++ b/svx/inc/svx/akrnitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index 81473875b4..c2644b9bce 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -33,8 +33,8 @@ // include --------------------------------------------------------------- #include -#include -#include +#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx index 37430bc883..7f5d7bb7f5 100644 --- a/svx/inc/svx/blnkitem.hxx +++ b/svx/inc/svx/blnkitem.hxx @@ -32,8 +32,8 @@ // include --------------------------------------------------------------- -#include -#include +#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx index 2337c66f79..1e117d040f 100644 --- a/svx/inc/svx/borderline.hxx +++ b/svx/inc/svx/borderline.hxx @@ -32,7 +32,7 @@ #define SVX_BORDERLINE_HXX #include -#include +#include #include "svx/svxdllapi.h" // Line defaults in twips (former Writer defaults): diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx index 82736c7410..a4ad27dc6f 100644 --- a/svx/inc/svx/boxitem.hxx +++ b/svx/inc/svx/boxitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_BOXITEM_HXX #define _SVX_BOXITEM_HXX -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx index 30fd5ea1a7..eaa800a899 100644 --- a/svx/inc/svx/brkitem.hxx +++ b/svx/inc/svx/brkitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx index baf4b12ff5..901c489a34 100644 --- a/svx/inc/svx/brshitem.hxx +++ b/svx/inc/svx/brshitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx index b23e3c6c15..0d5a901f7e 100644 --- a/svx/inc/svx/charreliefitem.hxx +++ b/svx/inc/svx/charreliefitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx index d81fbf6567..67933f26b2 100644 --- a/svx/inc/svx/charrotateitem.hxx +++ b/svx/inc/svx/charrotateitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx index 9a635dac25..36a7f38f7b 100644 --- a/svx/inc/svx/charscaleitem.hxx +++ b/svx/inc/svx/charscaleitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SFXENUMITEM_HXX -#include +#include #endif #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx index 76179a11bc..625ec28ca5 100644 --- a/svx/inc/svx/cmapitem.hxx +++ b/svx/inc/svx/cmapitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx index fc8e5d19bc..fa9bc7da76 100644 --- a/svx/inc/svx/cntritem.hxx +++ b/svx/inc/svx/cntritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 08b80f77d5..bcc09258b0 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "svx/svxdllapi.h" class XColorTable; diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx index b8d300e14a..da04d2120f 100644 --- a/svx/inc/svx/colritem.hxx +++ b/svx/inc/svx/colritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx index 4ee7fdb7dc..caa835b89a 100644 --- a/svx/inc/svx/crsditem.hxx +++ b/svx/inc/svx/crsditem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index 8b70601dc8..5d12e900f5 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "svx/svxdllapi.h" #include diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index 5056451c63..2f24e8786a 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -31,7 +31,7 @@ #ifndef _SVXE3DITEM_HXX #define _SVXE3DITEM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx index 64949e46d0..de8af1ee9b 100644 --- a/svx/inc/svx/editdata.hxx +++ b/svx/inc/svx/editdata.hxx @@ -35,7 +35,7 @@ #include #include "svx/svxdllapi.h" -#include +#include class SfxItemSet; class SfxPoolItem; diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx index 90a13b7114..f2b1aaabdf 100644 --- a/svx/inc/svx/editobj.hxx +++ b/svx/inc/svx/editobj.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx index f7aab6ba52..8d5c18b302 100644 --- a/svx/inc/svx/emphitem.hxx +++ b/svx/inc/svx/emphitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx index ed18f2bfab..a75e157ef3 100644 --- a/svx/inc/svx/escpitem.hxx +++ b/svx/inc/svx/escpitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx index 3dd2489b30..cc98e695ce 100644 --- a/svx/inc/svx/fhgtitem.hxx +++ b/svx/inc/svx/fhgtitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index e36b6b3502..61a1cbe353 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -31,7 +31,7 @@ #ifndef _FILLCTRL_HXX #define _FILLCTRL_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx index 0957d8554f..4e1f301aea 100644 --- a/svx/inc/svx/flditem.hxx +++ b/svx/inc/svx/flditem.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index 8eccd5be30..a24b5a5cab 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -34,7 +34,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include +#include #ifndef _DIALOG_HXX //autogen #include diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 03435c4e96..b88ba95bf8 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx index 9cb082031a..e50298f551 100644 --- a/svx/inc/svx/forbiddenruleitem.hxx +++ b/svx/inc/svx/forbiddenruleitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx index 3e68978b1b..70df9f75d5 100644 --- a/svx/inc/svx/frmdiritem.hxx +++ b/svx/inc/svx/frmdiritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index 8a969eb6d3..b717aed3b5 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_GRFCROP_HXX #define _SVX_GRFCROP_HXX -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx index cfb0e3a30e..770fafb8a1 100644 --- a/svx/inc/svx/hngpnctitem.hxx +++ b/svx/inc/svx/hngpnctitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx index 133f7bd1e3..97fffef06e 100644 --- a/svx/inc/svx/hyznitem.hxx +++ b/svx/inc/svx/hyznitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx index a17c608759..321e53fdbe 100644 --- a/svx/inc/svx/itemtype.hxx +++ b/svx/inc/svx/itemtype.hxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx index cd2eb35fb7..19f6b17f9a 100644 --- a/svx/inc/svx/keepitem.hxx +++ b/svx/inc/svx/keepitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx index d909434804..dc4d43c9f0 100644 --- a/svx/inc/svx/kernitem.hxx +++ b/svx/inc/svx/kernitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx index 87a26e1df1..1513c15e2b 100644 --- a/svx/inc/svx/langitem.hxx +++ b/svx/inc/svx/langitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx index 708e59aab9..57ee9cb29c 100644 --- a/svx/inc/svx/lrspitem.hxx +++ b/svx/inc/svx/lrspitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx index b99411663d..5723dd113e 100644 --- a/svx/inc/svx/lspcitem.hxx +++ b/svx/inc/svx/lspcitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC diff --git a/svx/inc/svx/msdffimp.hxx b/svx/inc/svx/msdffimp.hxx index bc40b396ec..b0ed4d1a38 100644 --- a/svx/inc/svx/msdffimp.hxx +++ b/svx/inc/svx/msdffimp.hxx @@ -34,7 +34,7 @@ #include #include #include // UINTXX -#include +#include #include #include diff --git a/svx/inc/svx/nhypitem.hxx b/svx/inc/svx/nhypitem.hxx index 73eeb648e9..6d97d9cab8 100644 --- a/svx/inc/svx/nhypitem.hxx +++ b/svx/inc/svx/nhypitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 87eeb33d66..75f253487b 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -46,7 +46,7 @@ #endif #include "svx/svxdllapi.h" -#include +#include // forward --------------------------------------------------------------- diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index af53769190..81a1972f23 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx index d3d8b57aa2..b6734dc5a4 100644 --- a/svx/inc/svx/numitem.hxx +++ b/svx/inc/svx/numitem.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #ifndef _SVX_NUMDEF_HXX //autogen diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 229d8bcf19..7a6e48a909 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/inc/svx/orphitem.hxx b/svx/inc/svx/orphitem.hxx index 2cf00190af..b3a284f068 100644 --- a/svx/inc/svx/orphitem.hxx +++ b/svx/inc/svx/orphitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx index 6453898898..b93f930529 100644 --- a/svx/inc/svx/outliner.hxx +++ b/svx/inc/svx/outliner.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index 79f9f6443d..6c84d71aac 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/paravertalignitem.hxx b/svx/inc/svx/paravertalignitem.hxx index 394c440a12..a8455819e2 100644 --- a/svx/inc/svx/paravertalignitem.hxx +++ b/svx/inc/svx/paravertalignitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/pbinitem.hxx b/svx/inc/svx/pbinitem.hxx index 95ad1193f6..f9b1caa8da 100644 --- a/svx/inc/svx/pbinitem.hxx +++ b/svx/inc/svx/pbinitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/pmdlitem.hxx b/svx/inc/svx/pmdlitem.hxx index c86064a30d..b05cf29646 100644 --- a/svx/inc/svx/pmdlitem.hxx +++ b/svx/inc/svx/pmdlitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/postitem.hxx b/svx/inc/svx/postitem.hxx index a259c16848..d5ccefd748 100644 --- a/svx/inc/svx/postitem.hxx +++ b/svx/inc/svx/postitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/prszitem.hxx b/svx/inc/svx/prszitem.hxx index ff46ab5937..6e6acff2a9 100644 --- a/svx/inc/svx/prszitem.hxx +++ b/svx/inc/svx/prszitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index 58aef4c972..b58839bdeb 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include "svx/svxdllapi.h" class SvxProtectItem; diff --git a/svx/inc/svx/scriptspaceitem.hxx b/svx/inc/svx/scriptspaceitem.hxx index d153c7b27f..a6966ed089 100644 --- a/svx/inc/svx/scriptspaceitem.hxx +++ b/svx/inc/svx/scriptspaceitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/scripttypeitem.hxx b/svx/inc/svx/scripttypeitem.hxx index 7850623dec..58c7f8a943 100644 --- a/svx/inc/svx/scripttypeitem.hxx +++ b/svx/inc/svx/scripttypeitem.hxx @@ -32,11 +32,11 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif -#include +#include #include "svx/svxdllapi.h" // class SvxScriptTypeItem ---------------------------------------------- diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index cecea4f7b1..7571b8ffe8 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDANGITM_HXX #define _SDANGITM_HXX -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 163172c1da..fa8105da68 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDASAITM_HXX #define _SDASAITM_HXX -#include +#include #include class SdrCustomShapeAdjustmentValue diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index a98dc7a0e2..f678492366 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index 9327fe343b..4a46bdc53a 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDGGAITM_HXX #define _SDGGAITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index dbe6a946af..680d828849 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -32,7 +32,7 @@ #define _SDGMOITM_HXX #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index e4d74645e6..5d6886d9e7 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDMETITM_HXX #define _SDMETITM_HXX -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 599f12f6ad..ed78dc85d2 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDOOITM_HXX #define _SDOOITM_HXX -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index b0bf892e4a..cd96f03ca0 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDPRCITM_HXX #define _SDPRCITM_HXX -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index 701dcaf728..b04fee0384 100644 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx @@ -31,7 +31,7 @@ #ifndef _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX #define _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index a1874fad6a..2a37c9161f 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -38,7 +38,7 @@ #include #include #include // fuer SdrLayerID -#include +#include #include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 70de9aeb57..2b5e7df3a1 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAAITM_HXX #define _SDTAAITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index bf00ce12fb..2704f946f5 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -30,7 +30,7 @@ #ifndef sdtacitm_hxx #define sdtacitm_hxx -#include +#include #include // Anzahl der Durchlaeufe. 0=Endlos. diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 72e17855b5..5d1a69e986 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTADITM_HXX #define _SDTADITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index eaac7692a2..81e9554149 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAITM_HXX #define _SDTAITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index 165d62c1b6..5874c830d2 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -30,7 +30,7 @@ #ifndef SDTAKITM_HXX #define SDTAKITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index b7517ef973..70dc5dc54f 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAYITM_HXX #define _SDTAYITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index e5ee89aa12..d37e006d62 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTFSITM_HXX #define _SDTFSITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 81c3e08c23..aa2f4bdcb2 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDYNITM_HXX #define _SDYNITM_HXX -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/shaditem.hxx b/svx/inc/svx/shaditem.hxx index 6160dbeebe..323e4a06fc 100644 --- a/svx/inc/svx/shaditem.hxx +++ b/svx/inc/svx/shaditem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/shdditem.hxx b/svx/inc/svx/shdditem.hxx index c4fe591783..9f6fa35af3 100644 --- a/svx/inc/svx/shdditem.hxx +++ b/svx/inc/svx/shdditem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/sizeitem.hxx b/svx/inc/svx/sizeitem.hxx index c5ee7b6e74..ca255a6128 100644 --- a/svx/inc/svx/sizeitem.hxx +++ b/svx/inc/svx/sizeitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/spltitem.hxx b/svx/inc/svx/spltitem.hxx index 29d0001298..4a12a22dcf 100644 --- a/svx/inc/svx/spltitem.hxx +++ b/svx/inc/svx/spltitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 4120f9b103..ea38817559 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -32,7 +32,7 @@ #define _SVDATTR_HXX #ifndef _SOLAR_HRC -#include +#include #endif #include #include diff --git a/svx/inc/svx/svdfppt.hxx b/svx/inc/svx/svdfppt.hxx index dba9f72cf6..7bc21a7816 100644 --- a/svx/inc/svx/svdfppt.hxx +++ b/svx/inc/svx/svdfppt.hxx @@ -34,7 +34,7 @@ #ifndef SVX_LIGHT #include -#include +#include #include #include #ifndef _SV_COLOR_HXX diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 473802d7cf..0fd8967c1a 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -39,7 +39,7 @@ #include #ifndef _SOLAR_HRC -#include +#include #endif #include diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 56c0e8550e..7238b80915 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -40,12 +40,12 @@ #ifndef _MAPMOD_HXX //autogen #include #endif -#include +#include #include #include -#include +#include -#include +#include #include #include diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 93bf3a1479..548d78a778 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include // fuer SdrLayerID diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 3aa7330a6f..81cd87a87d 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -32,7 +32,7 @@ #define _SVDPAGV_HXX #include -#include +#include #include #include #include diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 33fd3d0812..4620a13264 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -31,19 +31,20 @@ #ifndef _SVDPNTV_HXX #define _SVDPNTV_HXX -#include -#include -#include -#include +#include +#include +#include +#include #include #include // fuer SetOfByte #include #include #include -#include +#include #include #include "svx/svxdllapi.h" #include +#include //************************************************************ // Pre-Defines @@ -127,7 +128,7 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; //////////////////////////////////////////////////////////////////////////////////////////////////// -class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster +class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { friend class SdrPageView; friend class FrameAnimator; @@ -241,6 +242,7 @@ protected: protected: void AppendPaintWindow(SdrPaintWindow& rNew); SdrPaintWindow* RemovePaintWindow(SdrPaintWindow& rOld); + void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); public: sal_uInt32 PaintWindowCount() const { return maPaintWindows.size(); } diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index de73a88333..159e5c38ab 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -32,9 +32,9 @@ #define _SVDUNDO_HXX #ifndef _SOLAR_HRC -#include +#include #endif -#include +#include #include #include #include // fuer enum RepeatFuncts diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index ecbdc32cb4..cfa5b648b1 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -38,6 +38,7 @@ #include #include "svx/svxdllapi.h" #include +#include //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -197,8 +198,6 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi protected: SvtAccessibilityOptions maAccessibilityOptions; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - public: TYPEINFO(); SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L); @@ -235,6 +234,8 @@ public: virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index a9ea7d22b1..2bff30ee10 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -30,8 +30,8 @@ #ifndef _SVX3DITEMS_HXX #define _SVX3DITEMS_HXX -#include -#include +#include +#include #include diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx index 0651f7cd7d..26d34abb10 100644 --- a/svx/inc/svx/svxacorr.hxx +++ b/svx/inc/svx/svxacorr.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx index 335ecd3373..7f1c8aaa75 100644 --- a/svx/inc/svx/svxbox.hxx +++ b/svx/inc/svx/svxbox.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _LSTBOX_HXX //autogen diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index eb35d48735..275c7c7f23 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -31,8 +31,8 @@ #define _SVX_SVXIDS_HRC // include ------------------------------------------------------------------ -#include -#include +#include +#include #include #include diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 8974d9f29a..8800b7cb46 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -33,7 +33,7 @@ // include ------------------------------------------------------------------ #ifndef _SOLAR_HRC -#include +#include #endif // BOOL --------------------------------------------------------------------- diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index 78ab0344d4..36c481d267 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXCECITM_HXX #define _SXCECITM_HXX -#include +#include #include #include #include diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index bb051652a4..daeebaac51 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -31,7 +31,7 @@ #define _SXCIKITM_HXX #include -#include +#include enum SdrCircKind {SDRCIRC_FULL, SDRCIRC_SECT, diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index 9c11b8b112..ad7916e8a3 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXCTITM_HXX #define _SXCTITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 8157d4cc79..a0faab3317 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXEKITM_HXX #define _SXEKITM_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index ab8e35de0e..0095b40d85 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -30,7 +30,7 @@ #ifndef _SFXIITM_HXX #define _SFXIITM_HXX -#include +#include #include /*************************************************************************/ diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index 3f86b5e899..2dfa5fb3d6 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -31,8 +31,8 @@ #define _SYLAYITM_HXX #include -#include -#include +#include +#include #include //------------------------------ diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index 2fbce30fb7..eb972d4148 100644 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx @@ -31,7 +31,7 @@ #define _SXMFSITM_HXX #include -#include +#include // Formatstring (aehnl. Calc), z.B. "#.###,00km" // ueberschreibt SdrMeasureUnitItem und SdrMeasureShowUnitItem (n.i.) diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 1ecd7c317b..eae1cf6926 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -31,7 +31,7 @@ #define _SXMKITM_HXX #include -#include +#include enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 373396588c..efe8d8f9ff 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -31,7 +31,7 @@ #define _SXMTPITM_HXX #include -#include +#include #include "svx/svxdllapi.h" enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 6e907000cc..e3112f0c56 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -32,7 +32,7 @@ #include #include -#include +#include #include "svx/svxdllapi.h" // Vorgabe einer Masseinheit. Der Zahlenwert wird in diese Einheit umgerechnet diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index d19bc696af..b335886b9e 100644 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx @@ -31,7 +31,7 @@ #define _SXONITM_HXX #include -#include +#include //------------------------------ // class SdrObjectNameItem diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 0a8a3a0cec..267b0adb69 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -158,7 +158,7 @@ // ITEMID_...-Defines im *.cxx #include -#include +#include #include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx index 1e4dc79301..edd17a9ac6 100644 --- a/svx/inc/svx/tstpitem.hxx +++ b/svx/inc/svx/tstpitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/twolinesitem.hxx b/svx/inc/svx/twolinesitem.hxx index aeb65776ab..67417ac88c 100644 --- a/svx/inc/svx/twolinesitem.hxx +++ b/svx/inc/svx/twolinesitem.hxx @@ -31,7 +31,7 @@ #define _SVX_TWOLINESITEM_HXX #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx index d46f51322f..d5b328361a 100644 --- a/svx/inc/svx/udlnitem.hxx +++ b/svx/inc/svx/udlnitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/ulspitem.hxx b/svx/inc/svx/ulspitem.hxx index 32f546955b..87d2262b76 100644 --- a/svx/inc/svx/ulspitem.hxx +++ b/svx/inc/svx/ulspitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx index b6601ff93a..b60ec2d586 100644 --- a/svx/inc/svx/unoedsrc.hxx +++ b/svx/inc/svx/unoedsrc.hxx @@ -42,8 +42,8 @@ #ifndef _SV_COLOR_HXX //autogen #include #endif -#include -#include +#include +#include #include "svx/svxdllapi.h" #include diff --git a/svx/inc/svx/unoipset.hxx b/svx/inc/svx/unoipset.hxx index d0985f2b66..96b11fda51 100644 --- a/svx/inc/svx/unoipset.hxx +++ b/svx/inc/svx/unoipset.hxx @@ -34,7 +34,7 @@ #include #include #include "svx/svxdllapi.h" -#include +#include class SvxIDPropertyCombineList; class SdrItemPool; diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 9d59807ce0..a84360ccb8 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -44,7 +44,7 @@ #endif #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index fcef2c605b..98156d5d25 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index e516b1bc8f..fd95b762dc 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 7366f1acf0..73c4c45bf4 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -82,7 +82,7 @@ #include #include #include -#include +#include #include diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx index fb06d47343..da5c79c2ed 100644 --- a/svx/inc/svx/unotext.hxx +++ b/svx/inc/svx/unotext.hxx @@ -50,11 +50,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index 97d1b9349f..563bd01abd 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_VIEWLAYOUTITEM_HXX #define _SVX_VIEWLAYOUTITEM_HXX -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/wghtitem.hxx b/svx/inc/svx/wghtitem.hxx index 93575b270e..513a56822f 100644 --- a/svx/inc/svx/wghtitem.hxx +++ b/svx/inc/svx/wghtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/widwitem.hxx b/svx/inc/svx/widwitem.hxx index fe553574bd..f63cfbc48c 100644 --- a/svx/inc/svx/widwitem.hxx +++ b/svx/inc/svx/widwitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/inc/svx/writingmodeitem.hxx b/svx/inc/svx/writingmodeitem.hxx index 0f320b9612..27885c61ad 100644 --- a/svx/inc/svx/writingmodeitem.hxx +++ b/svx/inc/svx/writingmodeitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/wrlmitem.hxx b/svx/inc/svx/wrlmitem.hxx index ded8976ca4..6807b47999 100644 --- a/svx/inc/svx/wrlmitem.hxx +++ b/svx/inc/svx/wrlmitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 2b50f9d309..8ba3e394e5 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index 59a9dff68d..ffb69ae225 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -31,7 +31,7 @@ #ifndef SVX_XFILLIT0_HXX #define SVX_XFILLIT0_HXX -#include +#include #include #include diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index 2742542bac..73c3e43329 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLASIT_HXX #define _SVX_XFLASIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index ff4e898c29..f192de55be 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBCKIT_HXX #define _SVX_XFLBCKIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index e4b5174e90..4766860a7a 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMPIT_HXX #define _SVX_XFLBMPIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index eb22a47016..4fbfda9dec 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMSLI_HXX #define _SVX_XFLBMSLI_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 39eabd4d41..fbd0885750 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMSXY_HXX #define _SVX_XFLBMSXY_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index 0aee56400d..747a999b95 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMTIT_HXX #define _SVX_XFLBMTIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index 1d1d8d5eb5..a912b4348b 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBOXY_HXX #define _SVX_XFLBOXY_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index ba2159d7c0..627a5e4969 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBSTIT_HXX #define _SVX_XFLBSTIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index 83b283ea77..63fa08c7d5 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBTOXY_HXX #define _SVX_XFLBTOXY_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index 582cc0f6ac..ae0d5ab995 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLTRIT_HXX #define _SVX_XFLTRIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index c50514ff0d..1ed03ddb9c 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTADIT_HXX #define _SVX_XFTADIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index 56c234a549..71373c9fdf 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTDIIT_HXX #define _SVX_XFTDIIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index 040e347de5..c06e1ae718 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTMRIT_HXX #define _SVX_XFTMRIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 87fe4d5457..cb706080e9 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHIT_HXX #define _SVX_XFTSHIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index fbbdc09769..57af63d210 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHTIT_HXX #define _SVX_XFTSHTIT_HXX -#include +#include /************************************************************************* |* diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index f085f31ff6..87b35afccc 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHXY_HXX #define _SVX_XFTSHXY_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index d4630827e4..4c8693e69c 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSTIT_HXX #define _SVX_XFTSTIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index c98573cb02..98a79b0f2f 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XGRSCIT_HXX #define _SVX_XGRSCIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index 35b78558aa..59d7d131b6 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XIT_HXX #define _SVX_XIT_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index acaad7220c..74d3c447ff 100644 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include class XDash; class XDashTable; diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 9b9f1a8d97..db58c3a070 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -32,7 +32,7 @@ #define _SVX_XLINEIT0_HXX #include -#include +#include //--------------------- // class LineStyleItem //--------------------- diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index ce755f4e1c..7d72bbaef5 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -32,7 +32,7 @@ #define _SVX_XLNASIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 5b8d309739..3af01e45c4 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNEDCIT_HXX #define _SVX_XLNEDCIT_HXX -#include +#include #include "svx/svxdllapi.h" //---------------------------- diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 50cda7eb59..11d56f5fd8 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNEDWIT_HXX #define _SVX_XLNEDWIT_HXX -#include +#include #include "svx/svxdllapi.h" #define LINE_END_WIDTH_DEFAULT (200) diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index 5976c7d35f..c4805a413c 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNSTCIT_HXX #define _SVX_XLNSTCIT_HXX -#include +#include #include "svx/svxdllapi.h" //------------------------------ diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index a9b900a230..be49f3c470 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNSTWIT_HXX #define _SVX_XLNSTWIT_HXX -#include +#include #include "svx/svxdllapi.h" #define LINE_START_WIDTH_DEFAULT (200) diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index e11ea53c74..33d96c1852 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNTRIT_HXX #define _SVX_XLNTRIT_HXX -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index f55bbd6e3e..b89182723f 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNWTIT_HXX #define _SVX_XLNWTIT_HXX -#include +#include #include "svx/svxdllapi.h" //--------------------- diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index 58cf4bea94..7bf94b7ad9 100644 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx @@ -31,7 +31,7 @@ #ifndef _XPOOL_HXX #define _XPOOL_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index 044cff3805..3bdd30c3d9 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -34,8 +34,8 @@ #ifndef _XATTR_HXX #include #endif -#include -#include +#include +#include #include #include diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index b72d237b28..0350140910 100644 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx @@ -32,8 +32,8 @@ #define _SVX_XTEXTITEM_HXX #include -#include -#include +#include +#include #include #include diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index 627a93f054..d3921e7a9a 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -32,7 +32,7 @@ #define _SVX_TEXTIT0_HXX #include -#include +#include #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index e5c00cba79..311eb4a058 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_ZOOMITEM_HXX #define _SVX_ZOOMITEM_HXX -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index 35caf4059b..9ba2a52684 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_ZOOMSLIDERITEM_HXX #define _SVX_ZOOMSLIDERITEM_HXX -#include +#include #ifndef _SVX_SVXIDS_HRC #include #endif diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svxgrahicitem.hxx index c725f5784e..e68d47ad17 100644 --- a/svx/inc/svxgrahicitem.hxx +++ b/svx/inc/svxgrahicitem.hxx @@ -31,7 +31,7 @@ #define _SVX_GRAPHICITEM_HXX -#include +#include #include "svx/svxdllapi.h" #include diff --git a/svx/inc/svxrtf.hxx b/svx/inc/svxrtf.hxx index 3f0435b309..fffb5e3a36 100644 --- a/svx/inc/svxrtf.hxx +++ b/svx/inc/svxrtf.hxx @@ -35,11 +35,11 @@ #include #endif #include -#include +#include #include #define _SVSTDARR_USHORTS -#include +#include #include "svx/svxdllapi.h" diff --git a/svx/inc/txtrange.hxx b/svx/inc/txtrange.hxx index 51c87bc7d1..3427999306 100644 --- a/svx/inc/txtrange.hxx +++ b/svx/inc/txtrange.hxx @@ -34,7 +34,7 @@ #ifndef _TXTRANGE_HXX #define _SVSTDARR_BOOLS #define _SVSTDARR_LONGS -#include +#include #endif #include "svx/svxdllapi.h" diff --git a/svx/inc/unoapi.hxx b/svx/inc/unoapi.hxx index 6d0720e0e0..ffb19792b8 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/unoapi.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "svx/svxdllapi.h" class SvxShape; diff --git a/svx/inc/unoedhlp.hxx b/svx/inc/unoedhlp.hxx index 8e63b8a8b5..e46a91634a 100644 --- a/svx/inc/unoedhlp.hxx +++ b/svx/inc/unoedhlp.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/unofdesc.hxx b/svx/inc/unofdesc.hxx index ee35055b1f..64c7aab92a 100644 --- a/svx/inc/unofdesc.hxx +++ b/svx/inc/unofdesc.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/xlinjoit.hxx b/svx/inc/xlinjoit.hxx index e5ce32d620..d94f1fbbb5 100644 --- a/svx/inc/xlinjoit.hxx +++ b/svx/inc/xlinjoit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLINJOIT_HXX #define _SVX_XLINJOIT_HXX -#include +#include #include #include "svx/svxdllapi.h" diff --git a/svx/inc/xmlcnitm.hxx b/svx/inc/xmlcnitm.hxx index 52d14999f5..c75bb76833 100644 --- a/svx/inc/xmlcnitm.hxx +++ b/svx/inc/xmlcnitm.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XMLCNITM_HXX #define _SVX_XMLCNITM_HXX -#include +#include #include "svx/svxdllapi.h" class SvXMLNamespaceMap; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index e4afee69da..0ed80a5af8 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -36,7 +36,7 @@ // Global header // //------------------------------------------------------------------------ -#include +#include #include #include #include diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index a3737c181a..83350ae116 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx @@ -31,8 +31,8 @@ #ifndef _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX #define _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX -#include -#include +#include +#include #include #include diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 26c855ba69..89382818f4 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/SpellDialog.cxx b/svx/source/cui/SpellDialog.cxx index 9de0626fe3..f7b8981b84 100644 --- a/svx/source/cui/SpellDialog.cxx +++ b/svx/source/cui/SpellDialog.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/acccfg.cxx b/svx/source/cui/acccfg.cxx index 43e0bb5bae..e57b3e854c 100644 --- a/svx/source/cui/acccfg.cxx +++ b/svx/source/cui/acccfg.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "svx/dialogs.hrc" #include "acccfg.hrc" diff --git a/svx/source/cui/acccfg.hxx b/svx/source/cui/acccfg.hxx index d115544cfb..5ff1042fcb 100644 --- a/svx/source/cui/acccfg.hxx +++ b/svx/source/cui/acccfg.hxx @@ -60,7 +60,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include +#include #include diff --git a/svx/source/cui/align.cxx b/svx/source/cui/align.cxx index 77538a9a66..20b58020cb 100644 --- a/svx/source/cui/align.cxx +++ b/svx/source/cui/align.cxx @@ -52,12 +52,12 @@ #include #include #include -#include -#include +#include +#include #include #include //CHINA001 #include "flagsdef.hxx" //CHINA001 -#include //CHINA001 +#include //CHINA001 #include //CHINA001 namespace svx { diff --git a/svx/source/cui/autocdlg.cxx b/svx/source/cui/autocdlg.cxx index 4da7f0d8d8..67e5a2d5a0 100644 --- a/svx/source/cui/autocdlg.cxx +++ b/svx/source/cui/autocdlg.cxx @@ -37,13 +37,13 @@ #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -56,8 +56,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/cui/backgrnd.cxx b/svx/source/cui/backgrnd.cxx index 4e70365223..079d1273be 100644 --- a/svx/source/cui/backgrnd.cxx +++ b/svx/source/cui/backgrnd.cxx @@ -37,13 +37,13 @@ // include --------------------------------------------------------------- #include -#include +#include #include #include #include #include #include -#include +#include #ifndef _CNTIDS_HRC #include #endif @@ -77,7 +77,7 @@ #endif #include //CHINA001 #include "flagsdef.hxx" //CHINA001 -#include //CHINA001 +#include //CHINA001 #include //CHINA001 using namespace ::com::sun::star; // static ---------------------------------------------------------------- diff --git a/svx/source/cui/border.cxx b/svx/source/cui/border.cxx index 1ab5a45b9e..fa0b1bc6b1 100644 --- a/svx/source/cui/border.cxx +++ b/svx/source/cui/border.cxx @@ -60,7 +60,7 @@ #include //CHINA001 #include "flagsdef.hxx" //CHINA001 #include -#include //CHINA001 +#include //CHINA001 #include #include "borderconn.hxx" diff --git a/svx/source/cui/cfg.cxx b/svx/source/cui/cfg.cxx index 2931be6c17..249c25a875 100644 --- a/svx/source/cui/cfg.cxx +++ b/svx/source/cui/cfg.cxx @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/cfg.hxx b/svx/source/cui/cfg.hxx index 4aee5295e2..8bbbb8828a 100644 --- a/svx/source/cui/cfg.hxx +++ b/svx/source/cui/cfg.hxx @@ -54,7 +54,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include // SvUShorts +#include // SvUShorts #include #include #include diff --git a/svx/source/cui/cfgchart.cxx b/svx/source/cui/cfgchart.cxx index 2925fd9e7f..caa287a821 100644 --- a/svx/source/cui/cfgchart.cxx +++ b/svx/source/cui/cfgchart.cxx @@ -270,6 +270,10 @@ void SvxChartOptions::Commit() PutProperties( aNames, aValues ); } +void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + // -------------------- // class SvxChartColorTableItem // -------------------- diff --git a/svx/source/cui/cfgchart.hxx b/svx/source/cui/cfgchart.hxx index b519823466..a5626c9fc4 100644 --- a/svx/source/cui/cfgchart.hxx +++ b/svx/source/cui/cfgchart.hxx @@ -36,7 +36,7 @@ // header for ConfigItem #include // header for SfxPoolItem -#include +#include // header for XColorEntry #include @@ -90,6 +90,7 @@ public: void SetDefaultColors( const SvxChartColorTable& aCol ); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; // ==================== diff --git a/svx/source/cui/cfgutil.cxx b/svx/source/cui/cfgutil.cxx index 9df95d970d..03985bbb89 100644 --- a/svx/source/cui/cfgutil.cxx +++ b/svx/source/cui/cfgutil.cxx @@ -71,10 +71,10 @@ #include #include #include "svx/dialmgr.hxx" -#include +#include #define _SVSTDARR_STRINGSDTOR -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/cui/cfgutil.hxx b/svx/source/cui/cfgutil.hxx index 0f789ee0b8..789babe064 100644 --- a/svx/source/cui/cfgutil.hxx +++ b/svx/source/cui/cfgutil.hxx @@ -41,7 +41,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include diff --git a/svx/source/cui/chardlg.cxx b/svx/source/cui/chardlg.cxx index c67c6f40c8..8a53d6fd50 100644 --- a/svx/source/cui/chardlg.cxx +++ b/svx/source/cui/chardlg.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #define _SVX_CHARDLG_CXX -#include +#include #include #include @@ -88,12 +88,12 @@ #include #include #include -#include +#include #include #include #include //CHINA001 #include //CHINA001 -#include //CHINA001 +#include //CHINA001 #include //CHINA001 #include "flagsdef.hxx" //CHINA001 diff --git a/svx/source/cui/connpoolconfig.cxx b/svx/source/cui/connpoolconfig.cxx index 8965dc9105..bf9346b127 100644 --- a/svx/source/cui/connpoolconfig.cxx +++ b/svx/source/cui/connpoolconfig.cxx @@ -38,10 +38,10 @@ #include "connpoolsettings.hxx" #include "connpooloptions.hxx" -#include +#include #include #include -#include +#include #include #include "sdbcdriverenum.hxx" diff --git a/svx/source/cui/connpooloptions.cxx b/svx/source/cui/connpooloptions.cxx index de9b1ec86c..d4be1f525a 100644 --- a/svx/source/cui/connpooloptions.cxx +++ b/svx/source/cui/connpooloptions.cxx @@ -41,7 +41,7 @@ #include #include #include "connpoolsettings.hxx" -#include +#include #include #include "helpid.hrc" diff --git a/svx/source/cui/connpooloptions.hxx b/svx/source/cui/connpooloptions.hxx index 9bba07f614..cbc640c750 100644 --- a/svx/source/cui/connpooloptions.hxx +++ b/svx/source/cui/connpooloptions.hxx @@ -31,7 +31,7 @@ #ifndef _OFFAPP_CONNPOOLOPTIONS_HXX_ #define _OFFAPP_CONNPOOLOPTIONS_HXX_ -#include +#include #include #include #include diff --git a/svx/source/cui/connpoolsettings.hxx b/svx/source/cui/connpoolsettings.hxx index 7788ea7e80..b811022361 100644 --- a/svx/source/cui/connpoolsettings.hxx +++ b/svx/source/cui/connpoolsettings.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include //........................................................................ namespace offapp diff --git a/svx/source/cui/cuicharmap.cxx b/svx/source/cui/cuicharmap.cxx index a66c7b3c10..0c81cfb8e1 100644 --- a/svx/source/cui/cuicharmap.cxx +++ b/svx/source/cui/cuicharmap.cxx @@ -43,10 +43,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -570,7 +570,7 @@ IMPL_LINK( SvxCharMapData, DeleteHdl, PushButton *, EMPTYARG ) #include #include -#include +#include IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG ) { diff --git a/svx/source/cui/cuifmsearch.cxx b/svx/source/cui/cuifmsearch.cxx index 4549d9c7b3..aa27b0d828 100644 --- a/svx/source/cui/cuifmsearch.cxx +++ b/svx/source/cui/cuifmsearch.cxx @@ -52,7 +52,7 @@ #ifndef _SVX_DIALOGS_HRC #include #endif -#include +#include #include "fmsrcimp.hxx" #include "fmsrccfg.hxx" @@ -61,7 +61,7 @@ #endif // _FMSEARCH_HRC #include "cuifmsearch.hxx" #include "srchdlg.hxx" -#include +#include #include #include diff --git a/svx/source/cui/cuifmsearch.hxx b/svx/source/cui/cuifmsearch.hxx index 23b1ceeccf..3115830c44 100644 --- a/svx/source/cui/cuifmsearch.hxx +++ b/svx/source/cui/cuifmsearch.hxx @@ -36,7 +36,7 @@ #include //CHINA001 #define _SVSTDARR_STRINGSDTOR -#include +#include #ifndef _DIALOG_HXX //autogen #include diff --git a/svx/source/cui/cuigaldlg.cxx b/svx/source/cui/cuigaldlg.cxx index 1696462522..c1a5345a2c 100644 --- a/svx/source/cui/cuigaldlg.cxx +++ b/svx/source/cui/cuigaldlg.cxx @@ -50,11 +50,11 @@ #include "galbrws2.hxx" #include "galdlg.hxx" #include "cuigaldlg.hxx" //CHINA001 -#include +#include #ifndef _SVX_HELPID_HRC #include "helpid.hrc" #endif -#include +#include #include #include #include diff --git a/svx/source/cui/cuigaldlg.hxx b/svx/source/cui/cuigaldlg.hxx index 5290fd1cc2..eaf217a3df 100644 --- a/svx/source/cui/cuigaldlg.hxx +++ b/svx/source/cui/cuigaldlg.hxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/cuiimapwnd.cxx b/svx/source/cui/cuiimapwnd.cxx index 72147f49e6..dd4e40f173 100644 --- a/svx/source/cui/cuiimapwnd.cxx +++ b/svx/source/cui/cuiimapwnd.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/cui/cuiimapwnd.hxx b/svx/source/cui/cuiimapwnd.hxx index ff3582ae3a..c8080fefb8 100644 --- a/svx/source/cui/cuiimapwnd.hxx +++ b/svx/source/cui/cuiimapwnd.hxx @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/cuisrchdlg.cxx b/svx/source/cui/cuisrchdlg.cxx index 238cfb4432..b1a2f9df3e 100644 --- a/svx/source/cui/cuisrchdlg.cxx +++ b/svx/source/cui/cuisrchdlg.cxx @@ -39,16 +39,16 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include #define _CUI_SRCHDLG_CXX diff --git a/svx/source/cui/cuisrchdlg.hxx b/svx/source/cui/cuisrchdlg.hxx index 7ed9b2a508..b264b131bf 100644 --- a/svx/source/cui/cuisrchdlg.hxx +++ b/svx/source/cui/cuisrchdlg.hxx @@ -57,9 +57,9 @@ #endif #include #include -#include +#include #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include diff --git a/svx/source/cui/cuitbxform.cxx b/svx/source/cui/cuitbxform.cxx index 9cbbaca680..29b52a50e4 100644 --- a/svx/source/cui/cuitbxform.cxx +++ b/svx/source/cui/cuitbxform.cxx @@ -38,9 +38,9 @@ #include // HACK: prevent conflict between STLPORT and Workshop headers #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/svx/source/cui/dbregister.cxx b/svx/source/cui/dbregister.cxx index 0a38f57481..5a06145e07 100644 --- a/svx/source/cui/dbregister.cxx +++ b/svx/source/cui/dbregister.cxx @@ -40,7 +40,7 @@ #include "dbregistersettings.hxx" #include "connpooloptions.hxx" #ifndef SVTOOLS_FILENOTATION_HXX_ -#include +#include #endif #include #include @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ #include #include -#include +#include #include "doclinkdialog.hxx" #include #include diff --git a/svx/source/cui/dbregister.hxx b/svx/source/cui/dbregister.hxx index 303687300e..84c25b2047 100644 --- a/svx/source/cui/dbregister.hxx +++ b/svx/source/cui/dbregister.hxx @@ -34,7 +34,7 @@ #include "optpath.hxx" #include #include -#include +#include #include "ControlFocusHelper.hxx" #include diff --git a/svx/source/cui/dbregisterednamesconfig.cxx b/svx/source/cui/dbregisterednamesconfig.cxx index 08508314b1..277d74abb8 100644 --- a/svx/source/cui/dbregisterednamesconfig.cxx +++ b/svx/source/cui/dbregisterednamesconfig.cxx @@ -38,7 +38,7 @@ #include "dbregisterednamesconfig.hxx" -#include +#include #include #include @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include "dbregistersettings.hxx" diff --git a/svx/source/cui/dbregistersettings.hxx b/svx/source/cui/dbregistersettings.hxx index c6639a66bb..ff3f3c6fbc 100644 --- a/svx/source/cui/dbregistersettings.hxx +++ b/svx/source/cui/dbregistersettings.hxx @@ -32,7 +32,7 @@ #define SVX_DBREGISTERSETTING_HXX #include -#include +#include //........................................................................ namespace svx diff --git a/svx/source/cui/doclinkdialog.cxx b/svx/source/cui/doclinkdialog.cxx index d4dc239aaa..df4355dc7a 100644 --- a/svx/source/cui/doclinkdialog.cxx +++ b/svx/source/cui/doclinkdialog.cxx @@ -42,7 +42,7 @@ #include #include #ifndef SVTOOLS_FILENOTATION_HXX_ -#include +#include #endif #include #include diff --git a/svx/source/cui/grfpage.cxx b/svx/source/cui/grfpage.cxx index aabc03766f..e0a7d7f376 100644 --- a/svx/source/cui/grfpage.cxx +++ b/svx/source/cui/grfpage.cxx @@ -39,7 +39,7 @@ #include -#include +#include #include #include #include diff --git a/svx/source/cui/hlinettp.cxx b/svx/source/cui/hlinettp.cxx index 90b0f8042d..40e25ca418 100644 --- a/svx/source/cui/hlinettp.cxx +++ b/svx/source/cui/hlinettp.cxx @@ -34,9 +34,10 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include +//#include #include #include +#include #include "hlinettp.hxx" #include "hyperdlg.hrc" diff --git a/svx/source/cui/hltpbase.cxx b/svx/source/cui/hltpbase.cxx index 2e76c5be4a..55725565df 100644 --- a/svx/source/cui/hltpbase.cxx +++ b/svx/source/cui/hltpbase.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include "hyperdlg.hrc" diff --git a/svx/source/cui/hltpbase.hxx b/svx/source/cui/hltpbase.hxx index 6a8ed9a030..5f3ff2a793 100644 --- a/svx/source/cui/hltpbase.hxx +++ b/svx/source/cui/hltpbase.hxx @@ -43,8 +43,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/cui/iconcdlg.cxx b/svx/source/cui/iconcdlg.cxx index 8058041662..0a6332f0b6 100644 --- a/svx/source/cui/iconcdlg.cxx +++ b/svx/source/cui/iconcdlg.cxx @@ -39,7 +39,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #include #include "iconcdlg.hxx" diff --git a/svx/source/cui/iconcdlg.hxx b/svx/source/cui/iconcdlg.hxx index 4dce9737d2..b9a65739cc 100644 --- a/svx/source/cui/iconcdlg.hxx +++ b/svx/source/cui/iconcdlg.hxx @@ -38,8 +38,8 @@ #endif #include #include -#include -#include +#include +#include #include #include diff --git a/svx/source/cui/insdlg.cxx b/svx/source/cui/insdlg.cxx index 3d72463198..3fbbaad0a6 100644 --- a/svx/source/cui/insdlg.cxx +++ b/svx/source/cui/insdlg.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include "svuidlg.hrc" @@ -87,7 +87,7 @@ using namespace ::com::sun::star::ui::dialogs; using ::rtl::OUString; #define _SVSTDARR_STRINGSDTOR -#include +#include static String impl_getSvtResString( sal_uInt32 nId ) diff --git a/svx/source/cui/internationaloptions.cxx b/svx/source/cui/internationaloptions.cxx index 266c0a715c..203574617a 100644 --- a/svx/source/cui/internationaloptions.cxx +++ b/svx/source/cui/internationaloptions.cxx @@ -38,7 +38,7 @@ #ifndef _OFFAPP_INTERNATIONALOPTIONS_HRC_ #include "internationaloptions.hrc" #endif -#include +#include #include #include "helpid.hrc" diff --git a/svx/source/cui/linkdlg.cxx b/svx/source/cui/linkdlg.cxx index cb4fe626f8..448ac80b9d 100644 --- a/svx/source/cui/linkdlg.cxx +++ b/svx/source/cui/linkdlg.cxx @@ -60,7 +60,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #define MAX_FILENAME 18 #define MAX_LINKNAME 18 diff --git a/svx/source/cui/macroass.cxx b/svx/source/cui/macroass.cxx index ed8f8a46f3..2a7b234590 100644 --- a/svx/source/cui/macroass.cxx +++ b/svx/source/cui/macroass.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #define ITEMID_MACRO 0 -#include +#include #undef ITEMID_MACRO #include "macroass.hxx" @@ -41,7 +41,7 @@ #include #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include "cfgutil.hxx" diff --git a/svx/source/cui/macroass.hxx b/svx/source/cui/macroass.hxx index 55476b1120..59605a090a 100755 --- a/svx/source/cui/macroass.hxx +++ b/svx/source/cui/macroass.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/cui/macropg.cxx b/svx/source/cui/macropg.cxx index f705df676b..9e62945494 100644 --- a/svx/source/cui/macropg.cxx +++ b/svx/source/cui/macropg.cxx @@ -36,12 +36,12 @@ #include "macropg.hxx" #include #define _SVSTDARR_STRINGSDTOR -#include +#include #ifndef _SV_MEDIT_HXX #include #endif #ifndef _EITEM_HXX -#include +#include #endif #include diff --git a/svx/source/cui/macropg.hxx b/svx/source/cui/macropg.hxx index 31f1de9cbe..49e5ecb428 100644 --- a/svx/source/cui/macropg.hxx +++ b/svx/source/cui/macropg.hxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #ifndef _LSTBOX_HXX //autogen #include #endif diff --git a/svx/source/cui/numfmt.cxx b/svx/source/cui/numfmt.cxx index 614cd5259f..fa72be99d5 100644 --- a/svx/source/cui/numfmt.cxx +++ b/svx/source/cui/numfmt.cxx @@ -40,8 +40,8 @@ #endif // include --------------------------------------------------------------- -#include -#include +#include +#include #include #include #include @@ -49,7 +49,7 @@ #define _SVSTDARR_STRINGS #define _SVSTDARR_STRINGSDTOR -#include +#include #include #define _SVX_NUMFMT_CXX diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx index faa0d971b7..7a8720aa32 100644 --- a/svx/source/cui/numpages.cxx +++ b/svx/source/cui/numpages.cxx @@ -52,12 +52,12 @@ #include #endif #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include @@ -86,9 +86,9 @@ #include //CHINA001 #include //CHINA001 -#include //add CHINA001 -#include //add CHINA001 -#include //add CHINA001 +#include //add CHINA001 +#include //add CHINA001 +#include //add CHINA001 using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/svx/source/cui/numpages.hxx b/svx/source/cui/numpages.hxx index d0c00b121f..6777894832 100644 --- a/svx/source/cui/numpages.hxx +++ b/svx/source/cui/numpages.hxx @@ -43,7 +43,7 @@ #include #endif #include -#include +#include // ----------------------------------------------------------------------- class SvxNumRule; diff --git a/svx/source/cui/optctl.cxx b/svx/source/cui/optctl.cxx index 26d775cab7..c554bdea1f 100644 --- a/svx/source/cui/optctl.cxx +++ b/svx/source/cui/optctl.cxx @@ -43,7 +43,7 @@ #ifndef _SVX_DIALOGS_HRC #include #endif -#include +#include // class SvxCTLOptionsPage ----------------------------------------------------- diff --git a/svx/source/cui/optdict.cxx b/svx/source/cui/optdict.cxx index 166d17fb18..e299180ccf 100644 --- a/svx/source/cui/optdict.cxx +++ b/svx/source/cui/optdict.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include diff --git a/svx/source/cui/optgdlg.cxx b/svx/source/cui/optgdlg.cxx index 9827d9a36b..39f561ee8b 100644 --- a/svx/source/cui/optgdlg.cxx +++ b/svx/source/cui/optgdlg.cxx @@ -33,12 +33,12 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include +#include #include -#include +#include #include #include -#include +#include #include #include #include @@ -51,16 +51,16 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/optinet2.cxx b/svx/source/cui/optinet2.cxx index f3a795f09e..a03639f84e 100644 --- a/svx/source/cui/optinet2.cxx +++ b/svx/source/cui/optinet2.cxx @@ -39,10 +39,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -50,10 +50,10 @@ #include #include #include -#include +#include #ifndef _CNTWIDS_HRC -#include +#include #endif #include #ifndef _SV_SVAPP_HXX @@ -2154,7 +2154,7 @@ public: virtual ~MailerProgramCfg_Impl(); virtual void Commit(); - + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); }; /* -------------------------------------------------------------------------*/ @@ -2234,6 +2234,10 @@ void MailerProgramCfg_Impl::Commit() PutProperties(aNames, aValues); } +void MailerProgramCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + /* -------------------------------------------------------------------------*/ struct SvxEMailTabPage_Impl diff --git a/svx/source/cui/optinet2.hxx b/svx/source/cui/optinet2.hxx index 53f9cc695c..026674be36 100644 --- a/svx/source/cui/optinet2.hxx +++ b/svx/source/cui/optinet2.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/optmemory.cxx b/svx/source/cui/optmemory.cxx index 16dd8ae5d3..4859af4741 100644 --- a/svx/source/cui/optmemory.cxx +++ b/svx/source/cui/optmemory.cxx @@ -36,12 +36,12 @@ #endif #include -#include +#include #include -#include +#include #include #include -#include +#include #include #include #include @@ -53,11 +53,11 @@ #include #include #include -#include +#include #ifndef INCLUDED_SVTOOLS_MISCPOPT_HXX #include #endif -#include +#include #include #include #include diff --git a/svx/source/cui/optpath.cxx b/svx/source/cui/optpath.cxx index be9cdfd096..cc981a82ed 100644 --- a/svx/source/cui/optpath.cxx +++ b/svx/source/cui/optpath.cxx @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/cui/optsave.cxx b/svx/source/cui/optsave.cxx index 437f5f0fc5..19443c0dae 100644 --- a/svx/source/cui/optsave.cxx +++ b/svx/source/cui/optsave.cxx @@ -37,8 +37,8 @@ // include --------------------------------------------------------------- #include -#include -#include +#include +#include #define _SVX_OPTSAVE_CXX #include "optsave.hrc" diff --git a/svx/source/cui/optupdt.cxx b/svx/source/cui/optupdt.cxx index 25668f4149..e5d4d87ef1 100644 --- a/svx/source/cui/optupdt.cxx +++ b/svx/source/cui/optupdt.cxx @@ -38,7 +38,7 @@ // include --------------------------------------------------------------- #include #include -#include +#include #include "optupdt.hxx" #include "optupdt.hrc" diff --git a/svx/source/cui/page.cxx b/svx/source/cui/page.cxx index 2ebbf8bcde..446bca13a4 100644 --- a/svx/source/cui/page.cxx +++ b/svx/source/cui/page.cxx @@ -55,8 +55,8 @@ #include #endif #include -#include -#include +#include +#include #include #include #include "htmlmode.hxx" @@ -89,14 +89,14 @@ #include -#include +#include #include //CHINA001 // #i4219# #include -#include //CHINA001 -#include //CHINA001 +#include //CHINA001 +#include //CHINA001 #include //CHINA001 // configuration helper ======================================================= @@ -121,6 +121,9 @@ public: /** Returns true, if the current HTML export mode is set to HTML 3.2. */ inline bool IsExportModeHTML32() const { return mnExpMode == 0; } // 0 == HTML_CFG_HTML32, see offmgr/htmlcfg.hxx + virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + private: sal_Int32 mnExpMode; }; @@ -139,6 +142,13 @@ SvxHtmlExportModeConfigItem_Impl::SvxHtmlExportModeConfigItem_Impl() : aPropValues[ 0 ] >>= mnExpMode; } +void SvxHtmlExportModeConfigItem_Impl::Commit() +{ +} + +void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} // static ---------------------------------------------------------------- diff --git a/svx/source/cui/paragrph.cxx b/svx/source/cui/paragrph.cxx index 2275e0d8fe..df4253147a 100644 --- a/svx/source/cui/paragrph.cxx +++ b/svx/source/cui/paragrph.cxx @@ -34,7 +34,7 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include +#include #include #include #include @@ -58,7 +58,7 @@ -#include +#include #include #include #include "paragrph.hrc" @@ -81,9 +81,9 @@ #include #include "htmlmode.hxx" #include -#include //add CHINA001 +#include //add CHINA001 #include //add CHINA001 -#include //add CHINA001 +#include //add CHINA001 // static ---------------------------------------------------------------- diff --git a/svx/source/cui/postdlg.cxx b/svx/source/cui/postdlg.cxx index 5c50d1a433..a7f9f47c24 100644 --- a/svx/source/cui/postdlg.cxx +++ b/svx/source/cui/postdlg.cxx @@ -43,8 +43,8 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include -#include +#include +#include #include #include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svx/source/cui/scriptdlg.hrc b/svx/source/cui/scriptdlg.hrc index af327d5705..359dae6b8d 100644 --- a/svx/source/cui/scriptdlg.hrc +++ b/svx/source/cui/scriptdlg.hrc @@ -30,7 +30,7 @@ #ifndef _SCRIPTDLG_HRC #define _SCRIPTDLG_HRC -#include +#include #define SCRIPTDLG_OFFSET 400 diff --git a/svx/source/cui/sdrcelldlg.cxx b/svx/source/cui/sdrcelldlg.cxx index f5e9f719ce..56bccc68e9 100644 --- a/svx/source/cui/sdrcelldlg.cxx +++ b/svx/source/cui/sdrcelldlg.cxx @@ -34,7 +34,7 @@ #ifdef SVX_DLLIMPLEMENTATION #undef SVX_DLLIMPLEMENTATION #endif -#include +#include #include "flagsdef.hxx" #include "svx/dialogs.hrc" #include "sdrcelldlg.hxx" diff --git a/svx/source/cui/selector.cxx b/svx/source/cui/selector.cxx index 83e0e33bd8..8f81e5485a 100644 --- a/svx/source/cui/selector.cxx +++ b/svx/source/cui/selector.cxx @@ -83,7 +83,7 @@ using namespace ::com::sun::star::document; using namespace ::com::sun::star::container; #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include #include diff --git a/svx/source/cui/selector.hxx b/svx/source/cui/selector.hxx index b649a8e306..4cb3f8cc16 100644 --- a/svx/source/cui/selector.hxx +++ b/svx/source/cui/selector.hxx @@ -43,7 +43,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_STRINGSDTOR -#include // SvUShorts +#include // SvUShorts #include #define SVX_CFGGROUP_FUNCTION 1 diff --git a/svx/source/cui/splitcelldlg.cxx b/svx/source/cui/splitcelldlg.cxx index b746b7d650..abc84ddc9b 100644 --- a/svx/source/cui/splitcelldlg.cxx +++ b/svx/source/cui/splitcelldlg.cxx @@ -37,8 +37,8 @@ #include -#include -#include +#include +#include #include "svx/dialmgr.hxx" #include "splitcelldlg.hxx" diff --git a/svx/source/cui/srchxtra.cxx b/svx/source/cui/srchxtra.cxx index ae5f2d7365..1dc7580bef 100644 --- a/svx/source/cui/srchxtra.cxx +++ b/svx/source/cui/srchxtra.cxx @@ -40,8 +40,8 @@ #include "srchxtra.hxx" #include #include -#include -#include +#include +#include #include #ifndef _SVX_DIALOGS_HRC diff --git a/svx/source/cui/svuidlg.hrc b/svx/source/cui/svuidlg.hrc index b4f40e15ab..023e0f5135 100644 --- a/svx/source/cui/svuidlg.hrc +++ b/svx/source/cui/svuidlg.hrc @@ -28,7 +28,7 @@ * ************************************************************************/ -#include +#include #define HID_PASTE_DLG (HID_SO2_START + 0) #define HID_LINKDLG_TABLB (HID_SO2_START + 1) diff --git a/svx/source/cui/swpossizetabpage.cxx b/svx/source/cui/swpossizetabpage.cxx index b3aecc4405..0af3c55d7e 100644 --- a/svx/source/cui/swpossizetabpage.cxx +++ b/svx/source/cui/swpossizetabpage.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/cui/tabstpge.cxx b/svx/source/cui/tabstpge.cxx index 24a4a1ba90..8fccd7bc03 100644 --- a/svx/source/cui/tabstpge.cxx +++ b/svx/source/cui/tabstpge.cxx @@ -52,14 +52,14 @@ #include #include "dlgutil.hxx" #include -#include +#include #include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include #endif #include //CHINA001 #include //add CHINA001 -#include //add CHINA001 +#include //add CHINA001 // class TabWin_Impl ----------------------------------------------------- diff --git a/svx/source/cui/tparea.cxx b/svx/source/cui/tparea.cxx index 961c878df2..8a0b813e0e 100644 --- a/svx/source/cui/tparea.cxx +++ b/svx/source/cui/tparea.cxx @@ -61,7 +61,7 @@ #include "dlgname.hxx" #include #include "dlgutil.hxx" -#include //add CHINA001 +#include //add CHINA001 #include //add CHINA001 #define DLGWIN this->GetParent()->GetParent() diff --git a/svx/source/cui/transfrm.cxx b/svx/source/cui/transfrm.cxx index 538e8eb523..ad3b896330 100644 --- a/svx/source/cui/transfrm.cxx +++ b/svx/source/cui/transfrm.cxx @@ -57,8 +57,8 @@ #include #include "anchorid.hxx" #include -#include -#include +#include +#include #include // Toleranz fuer WorkingArea diff --git a/svx/source/cui/treeopt.cxx b/svx/source/cui/treeopt.cxx index 32da416f0c..74f1a1162b 100644 --- a/svx/source/cui/treeopt.cxx +++ b/svx/source/cui/treeopt.cxx @@ -72,13 +72,13 @@ #endif #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -86,7 +86,7 @@ #include #include -#include +#include #include #include #include @@ -312,6 +312,7 @@ public: virtual ~MailMergeCfg_Impl(); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); sal_Bool IsEmailSupported() const {return bIsEmailSupported;} @@ -341,6 +342,10 @@ void MailMergeCfg_Impl::Commit() { } +void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + //typedef SfxTabPage* (*FNCreateTabPage)( Window *pParent, const SfxItemSet &rAttrSet ); SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ) { @@ -1551,7 +1556,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) SFX_APP()->GetOptions(aOptSet); pRet->Put(aOptSet); - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxViewFrame* pViewFrame = SfxViewFrame::Current(); if ( pViewFrame ) @@ -1562,17 +1567,17 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId ) if( SFX_ITEM_AVAILABLE <= pDispatch->QueryState( SID_ATTR_YEAR2000, pItem ) ) pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, ((const SfxUInt16Item*)pItem)->GetValue() ) ); else - pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) ); + pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) ); } else - pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)pMisc->GetYear2000() ) ); + pRet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, (USHORT)aMisc.GetYear2000() ) ); // Sonstiges - Tabulator - pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, pMisc->IsNotFoundWarning())); + pRet->Put(SfxBoolItem(SID_PRINTER_NOTFOUND_WARN, aMisc.IsNotFoundWarning())); - sal_uInt16 nFlag = pMisc->IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0; - nFlag |= pMisc->IsPaperOrientationWarning() ? SFX_PRINTER_CHG_ORIENTATION : 0; + sal_uInt16 nFlag = aMisc.IsPaperSizeWarning() ? SFX_PRINTER_CHG_SIZE : 0; + nFlag |= aMisc.IsPaperOrientationWarning() ? SFX_PRINTER_CHG_ORIENTATION : 0; pRet->Put( SfxFlagItem( SID_PRINTER_CHANGESTODOC, nFlag )); } @@ -1686,7 +1691,7 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet { case SID_GENERAL_OPTIONS: { - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + utl::MiscCfg aMisc; const SfxPoolItem* pItem; SfxItemSet aOptSet(SFX_APP()->GetPool(), SID_ATTR_QUICKLAUNCHER, SID_ATTR_QUICKLAUNCHER ); aOptSet.Put(rSet); @@ -1707,20 +1712,20 @@ void OfaTreeOptionsDialog::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet SfxDispatcher* pDispatch = pViewFrame->GetDispatcher(); pDispatch->Execute( SID_ATTR_YEAR2000, SFX_CALLMODE_ASYNCHRON, pItem, 0L); } - pMisc->SetYear2000(nY2K); + aMisc.SetYear2000(nY2K); } // ------------------------------------------------------------------------- // Drucken auswerten // ------------------------------------------------------------------------- if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_NOTFOUND_WARN, sal_False, &pItem)) - pMisc->SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); + aMisc.SetNotFoundWarning(((const SfxBoolItem*)pItem)->GetValue()); if(SFX_ITEM_SET == rSet.GetItemState(SID_PRINTER_CHANGESTODOC, sal_False, &pItem)) { const SfxFlagItem* pFlag = (const SfxFlagItem*)pItem; - pMisc->SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE )); - pMisc->SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); + aMisc.SetPaperSizeWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_SIZE )); + aMisc.SetPaperOrientationWarning(0 != (pFlag->GetValue() & SFX_PRINTER_CHG_ORIENTATION )); } // ------------------------------------------------------------------------- // evaluate help options diff --git a/svx/source/cui/zoom.cxx b/svx/source/cui/zoom.cxx index 78fc77a336..97281f8714 100644 --- a/svx/source/cui/zoom.cxx +++ b/svx/source/cui/zoom.cxx @@ -38,8 +38,8 @@ // include --------------------------------------------------------------- #include -#include -#include +#include +#include #include #include diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/source/customshapes/EnhancedCustomShape2d.hxx index e8f40b49dd..7e88b933e0 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.hxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index ed94bcf075..f53d79bf5b 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 2fad91e12e..1ce09428f0 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index a663bc6fcf..c1561822cf 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -37,7 +37,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 1b33ad47ac..4c0bd9a87e 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index a81eba3cb1..6d5475fff7 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -35,7 +35,7 @@ #include #include // FRound #include -#include +#include #include #include #include diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 7258c2ca4a..f0827a25e7 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include "rtl/ustrbuf.hxx" diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index 84f5debf8c..9406c09672 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -47,7 +47,7 @@ // === includes (global) ================================================= #include -#include +#include #include // === /includes (global) ================================================ diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index becd5ad806..0a05a75b3d 100644 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include static ResMgr* pResMgr=0; diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index fe75592b6e..79d0490720 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 57e9296dbe..a1fd1e8bbd 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index d76dd9a4a2..8e016995a0 100644 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -50,7 +50,7 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS #define _SVSTDARR_XUB_STRLEN -#include +#include #endif #include diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index f83c7608ac..f1174bde5c 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -30,10 +30,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include -#include +#include #include #include #ifndef _UNOTOOLS_PROCESSFACTORY_HXX diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 9ba5238dea..1d8e3a5491 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include #include #include diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index 4956823903..f5c56a58e7 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -35,14 +35,14 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include +#include #include #include @@ -66,6 +66,8 @@ public: ~SearchDefaultConfigItem_Impl(); const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;} + virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void Commit(); }; /*-- 11.11.2003 14:20:59--------------------------------------------------- @@ -86,6 +88,14 @@ SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl() { } +void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + +void SearchDefaultConfigItem_Impl::Commit() +{ +} + /************************************************************************* |* |* Dialog zum Einf"ugen/"Andern eines Hyperlink diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 62cb5a4839..06b26d7562 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -52,13 +52,13 @@ #include #include #include -#include +#include #include #include #include #include #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" -#include +#include #include #include #include diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 85fe1b9057..f57679299c 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 31d108dfe0..507b03d30d 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index 51005adb84..4a2303149f 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -35,8 +35,8 @@ #include // USHRT_MAX #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/dialog/opengrf.cxx b/svx/source/dialog/opengrf.cxx index 9abaeb6b38..6ca40f2486 100644 --- a/svx/source/dialog/opengrf.cxx +++ b/svx/source/dialog/opengrf.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include #endif diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 552d2e862b..d81ec83ceb 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" // INCLUDE --------------------------------------------------------------- -#include +#include @@ -48,7 +48,7 @@ #include "protitem.hxx" #include "rlrcitem.hxx" #include "rulritem.hxx" -#include +#include // class SvxRulerItem ---------------------------------------------------- diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 5e67d87e28..74257dec75 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 515959fb03..3f117045b2 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include -#include +#include #include #include diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index c6d5101a9d..a472b92946 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -35,16 +35,16 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 6a4aecc293..10a572d43a 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -37,17 +37,17 @@ #include #include #include -#include +#include #ifndef _SVX_HELPID_HRC #include #endif #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 13d479b294..66c437c7ad 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -37,11 +37,11 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include diff --git a/svx/source/dialog/thesdlg.cxx b/svx/source/dialog/thesdlg.cxx index 78fb5fc85a..8e5170b6d6 100644 --- a/svx/source/dialog/thesdlg.cxx +++ b/svx/source/dialog/thesdlg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #ifndef _MSGBOX_HXX //autogen #include diff --git a/svx/source/editeng/SvXMLAutoCorrectExport.cxx b/svx/source/editeng/SvXMLAutoCorrectExport.cxx index 460212a112..71bc790664 100644 --- a/svx/source/editeng/SvXMLAutoCorrectExport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectExport.cxx @@ -33,7 +33,7 @@ #include #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include +#include #include using namespace ::com::sun::star::uno; diff --git a/svx/source/editeng/SvXMLAutoCorrectImport.cxx b/svx/source/editeng/SvXMLAutoCorrectImport.cxx index 692557307d..28b8f493dc 100644 --- a/svx/source/editeng/SvXMLAutoCorrectImport.cxx +++ b/svx/source/editeng/SvXMLAutoCorrectImport.cxx @@ -37,7 +37,7 @@ #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include +#include #include using namespace ::com::sun::star; diff --git a/svx/source/editeng/acorrcfg.cxx b/svx/source/editeng/acorrcfg.cxx index 4d455987bd..439691d4ca 100644 --- a/svx/source/editeng/acorrcfg.cxx +++ b/svx/source/editeng/acorrcfg.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/editeng/editattr.hxx b/svx/source/editeng/editattr.hxx index a24b1697c3..818ae1f710 100644 --- a/svx/source/editeng/editattr.hxx +++ b/svx/source/editeng/editattr.hxx @@ -54,7 +54,7 @@ class SvxFieldItem; class SvxLanguageItem; class SvxEmphasisMarkItem; class SvxCharReliefItem; -#include +#include class SfxVoidItem; diff --git a/svx/source/editeng/editdbg.hxx b/svx/source/editeng/editdbg.hxx index eb4e7caf8b..78764a0c9a 100644 --- a/svx/source/editeng/editdbg.hxx +++ b/svx/source/editeng/editdbg.hxx @@ -31,7 +31,7 @@ #ifndef _EDITDBG_HXX #define _EDITDBG_HXX -#include +#include #include #include diff --git a/svx/source/editeng/editdoc.hxx b/svx/source/editeng/editdoc.hxx index 90efe213b6..0828f9dc4e 100644 --- a/svx/source/editeng/editdoc.hxx +++ b/svx/source/editeng/editdoc.hxx @@ -38,9 +38,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include class ImpEditEngine; diff --git a/svx/source/editeng/editdoc2.cxx b/svx/source/editeng/editdoc2.cxx index e0d5fc27e9..4aba92347e 100644 --- a/svx/source/editeng/editdoc2.cxx +++ b/svx/source/editeng/editdoc2.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include -#include +#include #include #include #include diff --git a/svx/source/editeng/editeng.cxx b/svx/source/editeng/editeng.cxx index 80027fff73..67f8cb69ad 100644 --- a/svx/source/editeng/editeng.cxx +++ b/svx/source/editeng/editeng.cxx @@ -36,8 +36,8 @@ #define USE_SVXFONT #define _SVSTDARR_USHORTS -#include -#include +#include +#include #include #include diff --git a/svx/source/editeng/editeng.hrc b/svx/source/editeng/editeng.hrc index fa1fa19db7..f023ad546d 100644 --- a/svx/source/editeng/editeng.hrc +++ b/svx/source/editeng/editeng.hrc @@ -31,7 +31,7 @@ #define _EDITENG_HRC #ifndef _SOLAR_HRC -#include +#include #endif #define RID_EDITUNDO_DEL ( RID_EDIT_START + 0 ) diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx index d8f0a332b9..f0c9d0403f 100644 --- a/svx/source/editeng/editobj.cxx +++ b/svx/source/editeng/editobj.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/editeng/editview.cxx b/svx/source/editeng/editview.cxx index 0ec73b2dd6..ff0928954e 100644 --- a/svx/source/editeng/editview.cxx +++ b/svx/source/editeng/editview.cxx @@ -38,13 +38,13 @@ #define _SOLAR__PRIVATE 1 #include -#include +#include #include #include #define _SVSTDARR_USHORTS -#include +#include #include #include diff --git a/svx/source/editeng/edtspell.cxx b/svx/source/editeng/edtspell.cxx index 2fb92641ef..09768f67bf 100644 --- a/svx/source/editeng/edtspell.cxx +++ b/svx/source/editeng/edtspell.cxx @@ -39,8 +39,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/editeng/eehtml.hxx b/svx/source/editeng/eehtml.hxx index 1396a89307..0399553998 100644 --- a/svx/source/editeng/eehtml.hxx +++ b/svx/source/editeng/eehtml.hxx @@ -31,7 +31,7 @@ #ifndef _EEHTML_HXX #define _EEHTML_HXX -#include +#include #include #include diff --git a/svx/source/editeng/eeobj.cxx b/svx/source/editeng/eeobj.cxx index 4079f53348..8ab5389ee1 100644 --- a/svx/source/editeng/eeobj.cxx +++ b/svx/source/editeng/eeobj.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include using namespace ::com::sun::star; diff --git a/svx/source/editeng/eerdll.cxx b/svx/source/editeng/eerdll.cxx index ce23a1e00e..0951d2c6e4 100644 --- a/svx/source/editeng/eerdll.cxx +++ b/svx/source/editeng/eerdll.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/editeng/eertfpar.cxx b/svx/source/editeng/eertfpar.cxx index 65c1b6c516..39100e88ab 100644 --- a/svx/source/editeng/eertfpar.cxx +++ b/svx/source/editeng/eertfpar.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include "fontitem.hxx" diff --git a/svx/source/editeng/impedit.cxx b/svx/source/editeng/impedit.cxx index 51dff075be..cc5e08e5f7 100644 --- a/svx/source/editeng/impedit.cxx +++ b/svx/source/editeng/impedit.cxx @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/editeng/impedit.hxx b/svx/source/editeng/impedit.hxx index adf6afb7c2..39cbb85a8e 100644 --- a/svx/source/editeng/impedit.hxx +++ b/svx/source/editeng/impedit.hxx @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/editeng/impedit2.cxx b/svx/source/editeng/impedit2.cxx index 6be5fc0ef0..769a5c7ca0 100644 --- a/svx/source/editeng/impedit2.cxx +++ b/svx/source/editeng/impedit2.cxx @@ -44,9 +44,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/svx/source/editeng/impedit3.cxx b/svx/source/editeng/impedit3.cxx index 8316d9a94f..a51824ec34 100644 --- a/svx/source/editeng/impedit3.cxx +++ b/svx/source/editeng/impedit3.cxx @@ -36,7 +36,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #ifndef _WRKWIN_HXX //autogen #include @@ -68,7 +68,7 @@ #include #include -#include +#include #include diff --git a/svx/source/editeng/impedit5.cxx b/svx/source/editeng/impedit5.cxx index fde4e22e8c..02535744fe 100644 --- a/svx/source/editeng/impedit5.cxx +++ b/svx/source/editeng/impedit5.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include diff --git a/svx/source/editeng/svxacorr.cxx b/svx/source/editeng/svxacorr.cxx index 05ed752fbf..42fbfdb669 100644 --- a/svx/source/editeng/svxacorr.cxx +++ b/svx/source/editeng/svxacorr.cxx @@ -50,13 +50,13 @@ // fuer die Sort-String-Arrays aus dem SVMEM.HXX #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR -#include +#include #ifndef SVTOOLS_FSTATHELPER_HXX -#include +#include #endif #include -#include +#include #include #ifndef _COM_SUN_STAR_I18N_UNICODETYPE_HDL_ #include diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 02a0cf267b..fd3028493d 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include @@ -65,7 +65,7 @@ #include #define GALLERY_THEME "3D" -#include +#include #include #include "float3d.hrc" diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 85c35f03cb..d7274e3cb0 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index f43e372e34..cd6ee50e8d 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -39,11 +39,11 @@ #include #include #include -#include +#include #include "globl3d.hxx" #include #include -#include +#include #include #include diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 5079f527bc..05de87c705 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -40,7 +40,7 @@ #endif #include "globl3d.hxx" #include -#include +#include #include #include #include @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index aee39a7f10..7eac30e0b7 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -70,7 +70,7 @@ #ifndef _SVSTDARR_STRINGSDTOR #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_ULONGS -#include +#include #endif #include @@ -80,9 +80,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index f79731a982..4633985e45 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 2723e11ddc..f38c341847 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -37,7 +37,7 @@ #include -#include +#include #include #include #include diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index b7d117b3de..215e74d72f 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 7f9680e879..70b7de5662 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 55d92e07a0..e511a2e0ba 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include "fmexch.hxx" #include -#include +#include #ifndef _SVX_DBEXCH_HRC #include @@ -43,7 +43,7 @@ #include #define _SVSTDARR_ULONGS -#include +#include //........................................................................ namespace svxform diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index a0c7541f48..355b2114a0 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -56,10 +56,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -79,7 +79,7 @@ #endif #include "fmexch.hxx" #include -#include +#include #include #include #include @@ -91,7 +91,7 @@ #include #include "fmexpl.hxx" #include "formcontrolling.hxx" -#include +#include #include #include #include diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 645787b518..fc2fe241a3 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3919,6 +3919,10 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& } } +void FmXFormShell::Commit() +{ +} + //------------------------------------------------------------------------ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 58ad4d641e..c986ba991c 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "fmsrccfg.hxx" -#include +#include #include #include diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 66acca4748..b6a11292f1 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -73,7 +73,7 @@ #include "fmsearch.hrc" #endif #include -#include +#include #define EQUAL_BOOKMARKS(a, b) a == b diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 15a843ee88..32a245120f 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -48,10 +48,10 @@ #endif #include "flagsdef.hxx" -#include +#include #include -#include +#include //........................................................................ namespace svx diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 7555b3d30d..7dafa98b75 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -66,12 +66,12 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 6f3c9f5a75..c81875174e 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -91,8 +91,8 @@ #include "fmprop.hrc" #endif #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 2fc7022f73..32e3b85930 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -56,7 +56,7 @@ #include #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include +#include #include #include #include diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 4e28c62a83..dfd7ff7b33 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index c5a5eb2391..6d9a24d070 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -33,9 +33,9 @@ #include // HACK: prevent conflict between STLPORT and Workshop headers #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 0898dcdb2b..5a8baa8086 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 289ff4379c..e0ae02dde3 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "galbrws.hxx" diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index ca5df8ff16..6aee6b1f81 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -35,10 +35,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index c7f058ca80..e7375dbfff 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -37,10 +37,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 9acea83d4a..b2d09177d6 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index c76cdce576..655a5f11e0 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 85923590f3..db97446f93 100644 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/inc/SpellDialog.hxx b/svx/source/inc/SpellDialog.hxx index 351ff3d77e..3f7b1ce174 100644 --- a/svx/source/inc/SpellDialog.hxx +++ b/svx/source/inc/SpellDialog.hxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index c84d8d5ae5..8046f0ee42 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -32,11 +32,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index bb008a0727..2d664f9e2b 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -30,11 +30,11 @@ #ifndef _SVX_FMEXPL_HXX #define _SVX_FMEXPL_HXX -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 2cbbcb2fe4..03fe48776f 100644 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx @@ -31,7 +31,7 @@ #define _SVX_FMITEMS_HXX -#include +#include #include // FORWARD_DECLARE_INTERFACE(awt,XControlContainer) FORWARD_DECLARE_INTERFACE(uno,Any) diff --git a/svx/source/inc/fmresids.hrc b/svx/source/inc/fmresids.hrc index 867d82dd7c..f01a9fc415 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/source/inc/fmresids.hrc @@ -31,7 +31,7 @@ #define _SVX_FMRESIDS_HRC // include ----------------------------------------------------------- -#include +#include // unnamed ressources ------------------------------------------------------- // sub ressources ..................... diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 0e13eedb31..021f23d921 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -57,21 +57,21 @@ #ifndef _SVX_SVXIDS_HRC #include #endif -#include -#include +#include +#include #define _SVSTDARR_BOOLS #define _SVSTDARR_BYTES #define _SVSTDARR_LONGS #define _SVSTDARR_ULONGS #define _SVSTDARR_USHORTS -#include +#include #include #include "fmtools.hxx" #include "fmsrccfg.hxx" #include #include -#include +#include #include #include #include @@ -534,6 +534,7 @@ private: // ConfigItem related stuff virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames); + virtual void Commit(); void implAdjustConfigCache(); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > diff --git a/svx/source/inc/fmtools.hxx b/svx/source/inc/fmtools.hxx index 3c71698f06..ae6cbfda52 100644 --- a/svx/source/inc/fmtools.hxx +++ b/svx/source/inc/fmtools.hxx @@ -71,7 +71,7 @@ #ifndef _SVSTDARR_ULONGS #define _SVSTDARR_ULONGS -#include +#include #endif #include #include diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index fab29dbba6..e7ae4fd9c5 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -51,7 +51,7 @@ #include -#include +#include #include class FmFormModel; diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx index 5f093b375e..33b84ce08e 100644 --- a/svx/source/inc/svdoimp.hxx +++ b/svx/source/inc/svdoimp.hxx @@ -33,7 +33,7 @@ #include -//#include +//#include //#include //#include //#include // fuer SdrLayerID diff --git a/svx/source/inc/unoedprx.hxx b/svx/source/inc/unoedprx.hxx index 8edb9c773d..9235e212ba 100644 --- a/svx/source/inc/unoedprx.hxx +++ b/svx/source/inc/unoedprx.hxx @@ -32,7 +32,7 @@ #define _SVX_UNOEDPRX_HXX #include -#include +#include #include #include diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src index 66cac43b3b..5731087c48 100644 --- a/svx/source/intro/iso.src +++ b/svx/source/intro/iso.src @@ -33,7 +33,7 @@ #endif #ifndef _SVTOOLS_HRC -#include +#include #endif #include "intro.hrc" diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src index a29ea00665..fbe7d9b09f 100644 --- a/svx/source/intro/ooo.src +++ b/svx/source/intro/ooo.src @@ -29,7 +29,7 @@ ************************************************************************/ #ifndef _SVTOOLS_HRC -#include +#include #endif #ifndef _SVTOOLS_IMAGEMGR_HRC diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index b2fae878a7..9155d5049e 100644 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -40,7 +40,7 @@ #endif -//#include +//#include //#include "svxids.hrc" //#include "svxitems.hrc" diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index f588a7035a..26b4a4cfb8 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -34,7 +34,7 @@ #define _SVSTDARR_ULONGS #define _SVSTDARR_STRINGSDTOR -#include +#include #include #include diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx index 361b8d1750..486debf4b2 100644 --- a/svx/source/items/flditem.cxx +++ b/svx/source/items/flditem.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #define _SVX_FLDITEM_CXX diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx index 5b1bef3c9c..1a92eb889e 100644 --- a/svx/source/items/frmitems.cxx +++ b/svx/source/items/frmitems.cxx @@ -52,9 +52,9 @@ #define _SVX_FRMITEMS_CXX -#include +#include #include -#include +#include #include #include diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 96ce38d50b..1e90d7699b 100644 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -40,8 +40,8 @@ #include #define _ZFORLIST_DECLARE_TABLE -#include -#include +#include +#include #include #include diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index e01db0cffb..5268071f9c 100644 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx index aee8cf13fe..5fc1e51908 100644 --- a/svx/source/items/paraitem.cxx +++ b/svx/source/items/paraitem.cxx @@ -39,7 +39,7 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include #endif -#include +#include #include @@ -51,9 +51,9 @@ using namespace ::com::sun::star; #define GLOBALOVERFLOW3 #define _SVX_PARAITEM_CXX -#include +#include -#include +#include #include #include diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx index 8460558e67..b241e08996 100644 --- a/svx/source/items/textitem.cxx +++ b/svx/source/items/textitem.cxx @@ -47,7 +47,7 @@ #define GLOBALOVERFLOW3 -#include +#include #include #include #include @@ -56,10 +56,10 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index c3cd979955..221bd147fc 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -37,7 +37,7 @@ #include #endif #include -#include +#include #include #ifndef _SVX_SVXIDS_HRC #include diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index ddb8671064..0e93d05e90 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -35,9 +35,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 5b478be7b0..c279e75633 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include // HACK: prevent conflict between STLPORT and Workshop headern -#include +#include #include #include #include diff --git a/svx/source/msfilter/msdffimp.cxx b/svx/source/msfilter/msdffimp.cxx index 30251b6b3a..492a8d692c 100644 --- a/svx/source/msfilter/msdffimp.cxx +++ b/svx/source/msfilter/msdffimp.cxx @@ -56,7 +56,7 @@ #include #endif -#include +#include // textitem.hxx editdata.hxx @@ -170,7 +170,7 @@ #include #include "gallery.hxx" #include -#include +#include #include #include #include diff --git a/svx/source/options/asiancfg.cxx b/svx/source/options/asiancfg.cxx index cd1731d23d..8f38b47739 100644 --- a/svx/source/options/asiancfg.cxx +++ b/svx/source/options/asiancfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #include #include diff --git a/svx/source/options/htmlcfg.cxx b/svx/source/options/htmlcfg.cxx index d88542e014..68eddf861c 100644 --- a/svx/source/options/htmlcfg.cxx +++ b/svx/source/options/htmlcfg.cxx @@ -265,6 +265,11 @@ void SvxHtmlOptions::Commit() } PutProperties(aNames, aValues); } + +void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& ) +{ +} + // ----------------------------------------------------------------------- USHORT SvxHtmlOptions::GetFontSize(USHORT nPos) const { diff --git a/svx/source/options/optlingu.cxx b/svx/source/options/optlingu.cxx index 8b6b11eaba..5c8682a25e 100644 --- a/svx/source/options/optlingu.cxx +++ b/svx/source/options/optlingu.cxx @@ -36,7 +36,7 @@ #define _SVSTDARR_STRINGSDTOR #define _SVSTDARR_USHORTS //#ifndef _SVSTDARR_HXX -//#include +//#include //#endif #include #include @@ -44,7 +44,7 @@ #include #include #include -//#include +//#include #include #include #include @@ -72,8 +72,8 @@ #include #include #include -#include -#include +#include +#include #include #include #define _SVX_OPTLINGU_CXX diff --git a/svx/source/options/srchcfg.cxx b/svx/source/options/srchcfg.cxx index 60ef1a1143..f6d3ebd769 100644 --- a/svx/source/options/srchcfg.cxx +++ b/svx/source/options/srchcfg.cxx @@ -34,7 +34,7 @@ #ifndef _SVX_SRCHNCFG_HXX #include #endif -#include +#include #include #include #include diff --git a/svx/source/outliner/outl_pch.hxx b/svx/source/outliner/outl_pch.hxx index cf72c9cc5d..128abb3936 100644 --- a/svx/source/outliner/outl_pch.hxx +++ b/svx/source/outliner/outl_pch.hxx @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include +#include #include #include diff --git a/svx/source/outliner/outleeng.cxx b/svx/source/outliner/outleeng.cxx index 43fea6e316..7812afe440 100644 --- a/svx/source/outliner/outleeng.cxx +++ b/svx/source/outliner/outleeng.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include "editstat.hxx" #include "outlundo.hxx" diff --git a/svx/source/outliner/outlin2.cxx b/svx/source/outliner/outlin2.cxx index 9f41159053..c1ee8fe2a0 100644 --- a/svx/source/outliner/outlin2.cxx +++ b/svx/source/outliner/outlin2.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/outliner/outliner.cxx b/svx/source/outliner/outliner.cxx index f290864808..e247942df3 100644 --- a/svx/source/outliner/outliner.cxx +++ b/svx/source/outliner/outliner.cxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #define _OUTLINER_CXX #include @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -57,7 +57,7 @@ #include #include #include -#include +#include // #101498# calculate if it's RTL or not #include diff --git a/svx/source/outliner/outliner.hrc b/svx/source/outliner/outliner.hrc index 036a7d24e1..1b60bf32f5 100644 --- a/svx/source/outliner/outliner.hrc +++ b/svx/source/outliner/outliner.hrc @@ -31,7 +31,7 @@ #define _OUTLINER_HRC #ifndef _SOLAR_HRC -#include +#include #endif #ifndef RID_OUTL_START diff --git a/svx/source/outliner/outlvw.cxx b/svx/source/outliner/outlvw.cxx index 71387e4789..8f92442f30 100644 --- a/svx/source/outliner/outlvw.cxx +++ b/svx/source/outliner/outlvw.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #define _OUTLINER_CXX #include @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 8bd8c3b6b6..b19cf91773 100644 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include -#include +#include #include #include diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 5781e7bbeb..2253195261 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #ifndef ITEMID_GRF_CROP #define ITEMID_GRF_CROP 0 diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 115493a205..ce545b0315 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -41,7 +41,7 @@ ////////////////////////////////////////////////////////////////////////////// // includes for special text box shadow (SC) -#include +#include #include #include #include diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 789381c3a3..3e19d34a8a 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index cf5dfd3d72..9012768fcb 100644 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index 9c7810ea46..3b6f853e71 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 417445b7d7..1d28beae6a 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -31,7 +31,7 @@ #include "precompiled_svx.hxx" #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index 9538cba1b5..aaa885fb2a 100644 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index c7b82b7c11..e3ce0ada1d 100644 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -33,10 +33,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -54,7 +54,7 @@ #include // #114265# -#include +#include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 535d48d283..2e7cf36079 100644 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index f47c2e9793..78f1a865ee 100644 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index 576d9ffed5..7ed8a62e33 100644 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 53bef66057..5d55b764a8 100644 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx @@ -31,14 +31,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index de3021062b..bd1f683c5e 100644 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include #include -#include -#include +#include +#include #include #include diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 5726758b72..cf64c99da8 100644 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #include diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index 830a97c4e3..a6c9147c4f 100644 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 4f3a8d7a5d..4fd21ddc24 100644 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index e0590d5987..a31bfe8697 100644 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #include diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 28ebae1b9a..713e62811a 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index c2c74b8d16..a706a24af9 100644 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index f0d1af1590..5cd05f714e 100644 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include #include -#include +#include #include #include #include diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 69921e4227..2a180810e0 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index f04140dfac..e5d01d2c6c 100644 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index 45df3911ed..a721e7fb65 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include #include -#include -#include +#include +#include #include #include diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 7bd657ddc5..681bfa8728 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index baace122db..c60c2008d9 100644 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #include diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index fe317a495a..b1e45843ed 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include #include -#include +#include #include #include diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 229ba89db5..f545b24fc2 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index de03c1459e..f4a1d35ddb 100644 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -39,7 +39,7 @@ // include --------------------------------------------------------------- -#include +#include #include // Ranges ---------------------------------------------------------------- diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 545ce1d83c..9f4fe8b45f 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -36,7 +36,7 @@ #ifndef _STATUS_HXX //autogen #include #endif -#include +#include #include #include diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 843c845426..92035ffcb7 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -36,7 +36,7 @@ #ifndef _STATUS_HXX //autogen #include #endif -#include +#include #include #define _SVX_MODCTRL_CXX diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index a5376ab390..3292783154 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -42,9 +42,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index c2f34c9c20..c25dfbf14f 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -36,7 +36,7 @@ #ifndef _STATUS_HXX //autogen #include #endif -#include +#include #include #include diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 554366c9f1..82ea343bf9 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -41,7 +41,7 @@ #endif #include //#ifndef _SFXITEMPOOL_HXX -//#include +//#include //#endif #include #include @@ -50,9 +50,9 @@ #include #include -#include +#include -#include +#include #include #include diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 867c0956ca..37366c4f36 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -52,7 +52,7 @@ #include #include -#include +#include #include "xmlcnitm.hxx" #include diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 76c3c3f3ab..cd35046601 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -38,7 +38,7 @@ #define _MATH_H #endif #include -#include +#include #include #include #include // fuer SID_ATTR_TRANSFORM_... @@ -56,8 +56,8 @@ #include "svdstr.hrc" // Namen aus der Resource #include "svdglob.hxx" // StringCache #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index adca082371..a5089da2b5 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -33,14 +33,14 @@ #include #include -#include +#include //#include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index a9019ed200..60a96b1722 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -44,10 +44,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include "fontitem.hxx" #include @@ -59,13 +59,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 52bfccdc0c..f9f4ad2070 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include #include // FRound diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index c8e2066bf5..4c67ed985c 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -63,12 +63,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include #include //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 21eef709ef..2ba06a6b80 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -48,7 +48,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include #include -#include +#include #include //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 991582d84b..5bf35f2398 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -42,7 +42,7 @@ #include #include -#include +#include #include #include #include @@ -77,24 +77,24 @@ #include "fontitem.hxx" #include #include -#include +#include #include #include #include #include #include "forbiddencharacterstable.hxx" -#include +#include #include // #90477# #include -#include +#include // #95114# #include #include #include -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index f8220ad472..294c742f6a 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -46,7 +46,7 @@ #include #include "unopolyhelper.hxx" #include -#include +#include #include #include #include // FRound @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 828cd948ff..6fed224ea8 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -67,9 +67,9 @@ //#include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index ae5686b2c6..a6f3f8fcf7 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -97,7 +97,7 @@ #include #include #include // FRound -#include +#include // #97849# #include diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 8630d2c1d1..13b5f4a3a2 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 363fa04a3c..39d67e0646 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 1c89bbbd70..8c927b1146 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -48,8 +48,8 @@ #include #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include -#include +#include +#include #include #include "svdoimp.hxx" #include diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 67d02ac706..fad9cfaa5b 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -41,9 +41,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index d1966d1bfc..70cfe07549 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include @@ -58,7 +58,7 @@ #include "svdstr.hrc" // Objektname #include -#include +#include #include #include diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 975d5dea92..38f92739ca 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -45,8 +45,8 @@ #include #include "svdglob.hxx" // StringCache #include "svdstr.hrc" // Objektname -#include -#include +#include +#include #include #include #include @@ -63,7 +63,7 @@ #include #include #include -#include +#include #include "svdoimp.hxx" #include #include diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 1e89aab1b0..ceabd38c04 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -73,8 +73,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 8b6d05ca9e..9153794e9d 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include // #111111# diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index a0116cd1d9..5d1b83146c 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include @@ -59,9 +59,9 @@ #include #include #include -#include +#include #include -#include +#include #include // #110496# diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 5768def141..41d7b3af7b 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 077ddce02e..3aa4ef82d9 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index ff7d82c523..d5d09aea94 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include "svditext.hxx" #include // fuer GetMaxObjSize und GetStyleSheetPool @@ -47,8 +47,8 @@ #include -#include -#include +#include +#include #include #include #include @@ -56,10 +56,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index 07258ef669..0191eee99e 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 4a6484c230..a55e2d8740 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -51,7 +51,7 @@ #include #include -#include +#include // #90477# #include diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 9d4917efbc..1dad4b45ce 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 0df23e7bb0..79972849be 100644 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include DBG_NAME(SdrOutliner) /************************************************************************* diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index cf0034903e..eadfd6580e 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -42,7 +42,7 @@ #endif #include #include -#include +#include #include #include @@ -66,10 +66,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include @@ -289,14 +289,14 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) // Flag zur Visualisierung von Gruppen bVisualizeEnteredGroup = TRUE; - StartListening( maColorConfig ); + maColorConfig.AddListener(this); onChangeColorConfig(); } SdrPaintView::~SdrPaintView() { DBG_DTOR(SdrPaintView,NULL); - EndListening( maColorConfig ); + maColorConfig.RemoveListener(this); ClearPageView(); #ifdef DBG_UTIL @@ -345,12 +345,12 @@ void __EXPORT SdrPaintView::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } } +} - if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_COLORS_CHANGED ) - { - onChangeColorConfig(); - InvalidateAllWin(); - } +void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* p, sal_uInt32 ) +{ + onChangeColorConfig(); + InvalidateAllWin(); } //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 93c0024ecc..83588ab129 100644 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -40,7 +40,7 @@ #include "svx/svdmodel.hxx" #include "svx/fhgtitem.hxx" #include -#include +#include SdrText::SdrText( SdrTextObj& rObject, OutlinerParaObject* pOutlinerParaObject /* = 0 */ ) : mpOutlinerParaObject( pOutlinerParaObject ) diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 3d8285b895..63643f178d 100644 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 896e4d4aee..d55c311f14 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include "svdviter.hxx" diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 92b64f3501..c64937043e 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -185,14 +185,14 @@ SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) { bTextEditOnObjectsWithoutTextIfTextTool=FALSE; - StartListening( maAccessibilityOptions ); + maAccessibilityOptions.AddListener(this); onAccessibilityOptionsChanged(); } SdrView::~SdrView() { - EndListening( maAccessibilityOptions ); + maAccessibilityOptions.RemoveListener(this); } BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) @@ -1560,14 +1560,10 @@ BOOL SdrView::IsDeleteMarkedPossible() const return IsDeleteMarkedObjPossible(); } -void SdrView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) +void SdrView::ConfigurationChanged( ::utl::ConfigurationBroadcaster*p, sal_uInt32 nHint) { - if( rHint.ISA( SfxSimpleHint ) && ( (SfxSimpleHint&) rHint ).GetId() == SFX_HINT_ACCESSIBILITY_CHANGED ) - { - onAccessibilityOptionsChanged(); - } - - SdrCreateView::Notify(rBC, rHint); + onAccessibilityOptionsChanged(); + SdrCreateView::ConfigurationChanged(p, nHint); } SvtAccessibilityOptions& SdrView::getAccessibilityOptions() diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index b86fba9d0c..fa97fe1b29 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 4d717d4dfa..5effd864f1 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -52,8 +52,8 @@ #include "svdglob.hxx" // StringCache #include "xoutbmp.hxx" #include -#include -#include +#include +#include #include #include @@ -62,7 +62,7 @@ #include // b4967543 -#include +#include // #i72535# #include "fmobj.hxx" diff --git a/svx/source/svrtf/rtfitem.cxx b/svx/source/svrtf/rtfitem.cxx index 471b00d497..ca87b02088 100644 --- a/svx/source/svrtf/rtfitem.cxx +++ b/svx/source/svrtf/rtfitem.cxx @@ -92,8 +92,8 @@ #include -#include -#include +#include +#include #include "svxrtf.hxx" diff --git a/svx/source/svrtf/svxrtf.cxx b/svx/source/svrtf/svxrtf.cxx index 8808a1dfd9..8e4587909d 100644 --- a/svx/source/svrtf/svxrtf.cxx +++ b/svx/source/svrtf/svxrtf.cxx @@ -37,10 +37,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include diff --git a/svx/source/svxlink/linkmgr.cxx b/svx/source/svxlink/linkmgr.cxx index 5d96e0cfc4..84ebe26156 100644 --- a/svx/source/svxlink/linkmgr.cxx +++ b/svx/source/svxlink/linkmgr.cxx @@ -37,10 +37,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -50,8 +50,8 @@ #include #include #include -#include -#include +#include +#include #include #include "linkmgr.hxx" diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 0f399fa73d..22b5a774b9 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index 3be461adce..bdf6cf0537 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -38,9 +38,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include "celleditsource.hxx" #include "cell.hxx" diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index d639b3e884..00d09251cd 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "editstat.hxx" #include "svx/outlobj.hxx" #include "svx/svdview.hxx" diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 4d6eb39511..2cf9c2be96 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index 50388d6e5c..d3e22e9c0a 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -5,7 +5,7 @@ #define __SVX_COLORWINDOW_HXX_ #include -#include +#include #include #include diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 01f68240f9..24c237ee72 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -41,9 +41,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "chrtitem.hxx" #include diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 7cb779974b..3637cfa505 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include #include -#include +#include #include #include #include diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 0afb9e8571..0982e843db 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -34,7 +34,7 @@ #include "formatpaintbrushctrl.hxx" // header for class SfxBoolItem -#include +#include // header for define SFX_APP #include diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 87e65ec556..c42ac872ac 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -41,9 +41,9 @@ #endif #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 18101465bc..734afcd45b 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -38,7 +38,7 @@ #ifndef _SV_BUTTON_HXX //autogen #include #endif -#include +#include #include #include diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 864fcd6d22..a35bcb6f9e 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -43,11 +43,11 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include #ifndef _VCL_MNEMONIC_HXX_ diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx index 2cc1f4a43e..7c3b8b1201 100644 --- a/svx/source/tbxctrls/subtoolboxcontrol.cxx +++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 7d522a9e01..99a2fb0657 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -36,15 +36,15 @@ #include // HACK: prevent conflict between STLPORT and Workshop headers #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ #endif #include -#include +#include #define _SVX_TBCONTRL_CXX #include diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index fa56bc2111..7f9d4228cc 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include #include diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 1c9ccdfd55..88967319d4 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 287ed3513d..9de79579d3 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -34,9 +34,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 11130e35c6..b0ba9cbd8c 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -355,7 +355,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem #include "gallery.hxx" #include #include -#include +#include void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape ) { diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 691d23ab43..c56203ea0c 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index ef1848cf3e..630d05228d 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -32,9 +32,9 @@ #include "precompiled_svx.hxx" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 5d4effba94..79a9b78fc1 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 0296bc060f..f9d1ad5f0e 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include "unoapi.hxx" #include "xmlcnitm.hxx" diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 61854aa9cf..b560e9286e 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -30,9 +30,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include -#include +#include #include #ifndef SVX_LIGHT #ifndef _SFXDOCFILE_HXX diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index b23dc0e6b3..7eec2700c1 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include "UnoNameItemTable.hxx" diff --git a/svx/source/unodraw/unofdesc.cxx b/svx/source/unodraw/unofdesc.cxx index 879b13ad5e..2fa0cf4abc 100644 --- a/svx/source/unodraw/unofdesc.cxx +++ b/svx/source/unodraw/unofdesc.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "unofdesc.hxx" diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 9e17cc99e3..1cdb92d7f0 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include "UnoNameItemTable.hxx" #include diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 329905c31d..bb46cf14ff 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include "UnoNameItemTable.hxx" #include diff --git a/svx/source/unodraw/unoipset.cxx b/svx/source/unodraw/unoipset.cxx index 25a72b0f8b..87d0d53e8c 100644 --- a/svx/source/unodraw/unoipset.cxx +++ b/svx/source/unodraw/unoipset.cxx @@ -31,12 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 9b3a4ec7df..6309b48b0a 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index 1e7645df15..a2a6f8c6dd 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -36,12 +36,12 @@ #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/svx/source/unodraw/unonrule.cxx b/svx/source/unodraw/unonrule.cxx index 638c27fe68..c010c7da47 100644 --- a/svx/source/unodraw/unonrule.cxx +++ b/svx/source/unodraw/unonrule.cxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 8e4cd15b1c..f90b8ec83b 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 75c4d7ab68..224926e462 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -35,11 +35,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 172f8a5f69..e6b03af1c4 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include -#include -#include +#include +#include #include #include diff --git a/svx/source/unoedit/unoedsrc.cxx b/svx/source/unoedit/unoedsrc.cxx index ffeba43289..7efc794107 100644 --- a/svx/source/unoedit/unoedsrc.cxx +++ b/svx/source/unoedit/unoedsrc.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include +#include #include diff --git a/svx/source/unoedit/unofored.cxx b/svx/source/unoedit/unofored.cxx index 20807d46ff..0a357002aa 100644 --- a/svx/source/unoedit/unofored.cxx +++ b/svx/source/unoedit/unofored.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/unoedit/unoforou.cxx b/svx/source/unoedit/unoforou.cxx index 96eef1c0b0..6faf19938a 100644 --- a/svx/source/unoedit/unoforou.cxx +++ b/svx/source/unoedit/unoforou.cxx @@ -32,16 +32,16 @@ #include "precompiled_svx.hxx" #include -#include +#include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/svx/source/unoedit/unotext.cxx b/svx/source/unoedit/unotext.cxx index 0706db84a9..c70b63a1e6 100644 --- a/svx/source/unoedit/unotext.cxx +++ b/svx/source/unoedit/unotext.cxx @@ -38,16 +38,16 @@ #include #endif #include -#include +#include #include -#include +#include #include #include #include -#include +#include -#include +#include #include #include diff --git a/svx/source/unoedit/unotext2.cxx b/svx/source/unoedit/unotext2.cxx index 186f980c7c..249fd71d4e 100644 --- a/svx/source/unoedit/unotext2.cxx +++ b/svx/source/unoedit/unotext2.cxx @@ -34,7 +34,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include #include #include diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 77ad6522bf..5dbf7cc707 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -44,8 +44,8 @@ #ifndef _SV_GRAPH_HXX_ #include #endif -#include -#include +#include +#include #ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_ diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 8a0f6f95dd..96a2956f63 100644 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/svx/source/xml/xmltxtexp.cxx b/svx/source/xml/xmltxtexp.cxx index f8b01a727c..08aed66ede 100644 --- a/svx/source/xml/xmltxtexp.cxx +++ b/svx/source/xml/xmltxtexp.cxx @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #ifndef _SVSTOR_HXX diff --git a/svx/source/xml/xmltxtimp.cxx b/svx/source/xml/xmltxtimp.cxx index 092540886a..966b467aa9 100644 --- a/svx/source/xml/xmltxtimp.cxx +++ b/svx/source/xml/xmltxtimp.cxx @@ -44,7 +44,7 @@ #ifndef _SVSTOR_HXX #include #endif -#include +#include #include #include #include "xmloff/xmlmetae.hxx" diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 2b9002aa46..b3a797f956 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include "impgrf.hxx" diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 1e527885b7..eb47f435ad 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -43,16 +43,16 @@ #include #include #include -#include +#include #include #include "unoapi.hxx" -#include +#include #include "unopolyhelper.hxx" #include -#include +#include #include #include "svdstr.hrc" #include "xattr.hxx" diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index f34e9859aa..d0f2052526 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include "xattr.hxx" diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 40e7804adc..0bdaf792bb 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -38,13 +38,13 @@ #include #include #ifndef _SFXIPOOL_HXX -#include +#include #endif -#include +#include #ifndef _SFXIPOOL_HXX -#include +#include #endif -#include +#include #include #include "xexch.hxx" diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index fe81d0f8bd..f583b2edde 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include /************************************************************************* |* diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 57e56fdec0..747a9c873b 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index e2a3ad1902..a3b2e6d6b3 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 4f43f10ce2..75f41bb262 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 90eba033e8..3e5bed7505 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include #include diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index f83e6c35f3..1e48f30c13 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -49,7 +49,7 @@ #ifndef _SV_APP_HXX #include #endif -#include +#include #include #include diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx index 13cd4ea698..fa1b80b97e 100644 --- a/svx/workben/edittest.cxx +++ b/svx/workben/edittest.cxx @@ -89,10 +89,10 @@ #include // SVTOOLS -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index 7e6cf43cff..208ba5b714 100644 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx @@ -37,7 +37,7 @@ #include #include #ifndef _SVTOOLS_HRC -#include +#include #endif #include diff --git a/uui/source/cookiedg.cxx b/uui/source/cookiedg.cxx index 98a91fd9f5..34e3d96a8a 100644 --- a/uui/source/cookiedg.cxx +++ b/uui/source/cookiedg.cxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include +#include #include #include diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 127a9bcbd6..cc65580aec 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -113,8 +113,8 @@ #include "vos/mutex.hxx" #include "tools/rcid.h" #include "vcl/svapp.hxx" -#include "svtools/svtools.hrc" -#include "svtools/httpcook.hxx" +#include "svl/svtools.hrc" +#include "svl/httpcook.hxx" #include "svtools/sfxecode.hxx" #include "toolkit/helper/vclunohelper.hxx" #include "comphelper/sequenceashashmap.hxx" @@ -140,7 +140,7 @@ #include "loginerr.hxx" #include -#include +#include using namespace com::sun; namespace csss = ::com::sun::star::security; diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index bbfcaf7764..de76cced22 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -32,7 +32,7 @@ #define UUI_IDS_HRC #ifndef _SOLAR_HRC -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #endif #ifndef _ERRCODE_HXX #include "tools/errcode.hxx" diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 907f3682fe..1346445aca 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -436,15 +436,15 @@ #include "sot/clsids.hxx" -#include "svtools/cntnrsrt.hxx" -#include "svtools/itemset.hxx" +#include "svl/cntnrsrt.hxx" +#include "svl/itemset.hxx" #include "unotools/moduleoptions.hxx" -#include "svtools/nfsymbol.hxx" -#include "svtools/numuno.hxx" -#include "svtools/poolitem.hxx" -#include "svtools/svarray.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/urihelper.hxx" +#include "svl/nfsymbol.hxx" +#include "svl/numuno.hxx" +#include "svl/poolitem.hxx" +#include "svl/svarray.hxx" +#include "svl/svstdarr.hxx" +#include "svl/urihelper.hxx" #include "tools/bigint.hxx" diff --git a/xmloff/inc/xmlcnitm.hxx b/xmloff/inc/xmlcnitm.hxx index add06ae3f3..b63697781a 100644 --- a/xmloff/inc/xmlcnitm.hxx +++ b/xmloff/inc/xmlcnitm.hxx @@ -31,7 +31,7 @@ #ifndef _XMLOFF_XMLCNITM_HXX #define _XMLOFF_XMLCNITM_HXX -#include +#include class SvXMLNamespaceMap; namespace rtl { class OUString; } diff --git a/xmloff/inc/xmloff/xmlcnimp.hxx b/xmloff/inc/xmloff/xmlcnimp.hxx index b7306d5158..2482369d63 100644 --- a/xmloff/inc/xmloff/xmlcnimp.hxx +++ b/xmloff/inc/xmloff/xmlcnimp.hxx @@ -35,11 +35,11 @@ #include "xmloff/dllapi.h" #include "sal/types.h" #include -#include +#include #include #define _SVSTDARR_USHORTS -#include +#include namespace rtl { class OUString; } diff --git a/xmloff/source/core/i18nmap.cxx b/xmloff/source/core/i18nmap.cxx index 5f5d1a60c0..89cb16c9c2 100644 --- a/xmloff/source/core/i18nmap.cxx +++ b/xmloff/source/core/i18nmap.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include #include -#include +#include #include "i18nmap.hxx" using namespace rtl; diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index f97e7cbfa3..26ce46ee60 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -86,7 +86,7 @@ #include #include "PropertySetMerger.hxx" -#include "svtools/urihelper.hxx" +#include "svl/urihelper.hxx" #include "xformsexport.hxx" #include diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index e42dfecbe7..1dc3caf249 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "unointerfacetouniqueidentifiermapper.hxx" #include #include diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx index 9463dea06c..1d8583dbcd 100644 --- a/xmloff/source/core/xmltkmap.cxx +++ b/xmloff/source/core/xmltkmap.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include #include -#include +#include #include #include diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index e47b144ff7..0254d6ddf1 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include "PropertySetMerger.hxx" #include "sdpropls.hxx" #include "layerimp.hxx" diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index f45fb244b8..363393bd73 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include -#include +#include #include #include "xmlnmspe.hxx" #include diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 64aca01b6a..9b1bbca72b 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/xmloff/source/style/numehelp.cxx b/xmloff/source/style/numehelp.cxx index 530f32c97a..d7ed9b35d7 100644 --- a/xmloff/source/style/numehelp.cxx +++ b/xmloff/source/style/numehelp.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xmloff/source/style/styleexp.cxx b/xmloff/source/style/styleexp.cxx index fa1877b481..4317107268 100644 --- a/xmloff/source/style/styleexp.cxx +++ b/xmloff/source/style/styleexp.cxx @@ -33,7 +33,7 @@ #include #ifndef _SVSTDARR_STRINGSSORTDTOR_DECL #define _SVSTDARR_STRINGSSORTDTOR -#include +#include #endif #include #include "xmlnmspe.hxx" diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx index eac3d834cc..caf36c88c3 100644 --- a/xmloff/source/style/xmlexppr.cxx +++ b/xmloff/source/style/xmlexppr.cxx @@ -54,7 +54,7 @@ #ifndef _SVSTDARR_USHORTS #define _SVSTDARR_USHORTS -#include +#include #endif using ::rtl::OUString; diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx index 1fb40b3d05..61c1617bb1 100644 --- a/xmloff/source/style/xmlnumfe.cxx +++ b/xmloff/source/style/xmlnumfe.cxx @@ -34,10 +34,10 @@ #define _SVSTDARR_ULONGS #define _ZFORLIST_DECLARE_TABLE -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -60,8 +60,8 @@ #include // SvXMLNumFmtDefaults #define _SVSTDARR_USHORTS -#include -#include +#include +#include #include #include diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx index c61e7a87ca..b8ccfdf909 100644 --- a/xmloff/source/style/xmlnumfi.cxx +++ b/xmloff/source/style/xmlnumfi.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" -#include +#include #define _ZFORLIST_DECLARE_TABLE -#include +#include -#include -#include +#include +#include #include #include #include diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index b96c7e9bb8..0c88e2d27b 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -73,7 +73,7 @@ #include #define _SVSTDARR_USHORTS -#include +#include using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/xmlstyle.cxx b/xmloff/source/style/xmlstyle.cxx index 2a77dd0566..21ecbb0ea0 100644 --- a/xmloff/source/style/xmlstyle.cxx +++ b/xmloff/source/style/xmlstyle.cxx @@ -46,8 +46,8 @@ #endif #include #include -#include -#include +#include +#include #include #include "xmlnmspe.hxx" #include diff --git a/xmloff/source/style/xmltabi.cxx b/xmloff/source/style/xmltabi.cxx index e365ca3aac..35508f7909 100644 --- a/xmloff/source/style/xmltabi.cxx +++ b/xmloff/source/style/xmltabi.cxx @@ -44,7 +44,7 @@ #include "xmltabi.hxx" #define _SVSTDARR_USHORTS -#include +#include using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx index 5bb67f6986..7a9a62c2f3 100644 --- a/xmloff/source/text/XMLTextColumnsContext.cxx +++ b/xmloff/source/text/XMLTextColumnsContext.cxx @@ -43,7 +43,7 @@ #include #include "XMLTextColumnsContext.hxx" #define _SVSTDARR_USHORTS -#include +#include using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/text/XMLTextListAutoStylePool.cxx b/xmloff/source/text/XMLTextListAutoStylePool.cxx index 26a4c4309e..a0a62cab85 100644 --- a/xmloff/source/text/XMLTextListAutoStylePool.cxx +++ b/xmloff/source/text/XMLTextListAutoStylePool.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_xmloff.hxx" #include -#include +#include #include #include #include diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index 23422c10f6..a0ad13d6a9 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -34,7 +34,7 @@ #include #ifndef _SVSTDARR_STRINGSDTOR_DECL #define _SVSTDARR_STRINGSDTOR -#include +#include #endif #include #include diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx index d5e88e8719..b47ed6ec6b 100644 --- a/xmloff/source/text/txtparae.cxx +++ b/xmloff/source/text/txtparae.cxx @@ -34,9 +34,9 @@ #include #ifndef _SVSTDARR_LONGS_DECL #define _SVSTDARR_LONGS -#include +#include #endif -#include +#include #include #include diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx index fa68a86bdf..ceeb676e8b 100644 --- a/xmloff/source/text/txtparai.cxx +++ b/xmloff/source/text/txtparai.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx index e0975411a5..4a4a1228a0 100644 --- a/xmloff/source/text/txtparaimphint.hxx +++ b/xmloff/source/text/txtparaimphint.hxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include "XMLTextFrameContext.hxx" #include -- cgit v1.2.3 From 44d1506facd61c1676c6af97096d350f56b1057a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sun, 18 Oct 2009 15:05:21 +0200 Subject: #i103496#: move some enums, defines and inlines from vcl to tools to get xmloff free of vcl stuff --- xmloff/inc/VisAreaContext.hxx | 2 +- xmloff/inc/VisAreaExport.hxx | 2 +- xmloff/inc/pch/precompiled_xmloff.hxx | 4 +- xmloff/inc/xexptran.hxx | 2 +- xmloff/inc/xmlehelp.hxx | 2 +- xmloff/inc/xmloff/styleexp.hxx | 2 +- xmloff/inc/xmloff/xmlexp.hxx | 2 +- xmloff/inc/xmloff/xmlnume.hxx | 2 +- xmloff/inc/xmloff/xmluconv.hxx | 2 +- xmloff/source/core/xmlehelp.cxx | 77 ---------------------------- xmloff/source/core/xmluconv.cxx | 2 +- xmloff/source/draw/shapeexport2.cxx | 2 +- xmloff/source/draw/xexptran.cxx | 2 +- xmloff/source/forms/elementexport.cxx | 3 +- xmloff/source/forms/formenums.cxx | 2 +- xmloff/source/forms/layerimport.cxx | 2 +- xmloff/source/style/EnumPropertyHdl.cxx | 14 ----- xmloff/source/style/XMLFontAutoStylePool.cxx | 2 +- xmloff/source/style/fonthdl.cxx | 2 +- xmloff/source/style/postuhdl.cxx | 2 +- xmloff/source/style/weighhdl.cxx | 2 +- xmloff/source/style/xmlnume.cxx | 2 +- xmloff/source/style/xmlnumi.cxx | 2 +- xmloff/source/text/txtprhdl.cxx | 2 +- 24 files changed, 23 insertions(+), 115 deletions(-) (limited to 'xmloff/inc') diff --git a/xmloff/inc/VisAreaContext.hxx b/xmloff/inc/VisAreaContext.hxx index dc53a0ba4b..5ac403c109 100644 --- a/xmloff/inc/VisAreaContext.hxx +++ b/xmloff/inc/VisAreaContext.hxx @@ -32,7 +32,7 @@ #define _XMLOFF_VISAREACONTEXT_HXX #include -#include +#include class Rectangle; diff --git a/xmloff/inc/VisAreaExport.hxx b/xmloff/inc/VisAreaExport.hxx index 5acc5c7925..857e0bae62 100644 --- a/xmloff/inc/VisAreaExport.hxx +++ b/xmloff/inc/VisAreaExport.hxx @@ -31,7 +31,7 @@ #ifndef _XMLOFF_VISAREAEXPORT_HXX #define _XMLOFF_VISAREAEXPORT_HXX -#include +#include #include class SvXMLExport; diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 1346445aca..677b30bde2 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -469,9 +469,9 @@ #include "unotools/processfactory.hxx" #include "unotools/streamwrap.hxx" -#include "vcl/fldunit.hxx" +#include "tools/fldunit.hxx" #include "vcl/fontcvt.hxx" -#include "vcl/mapunit.hxx" +#include "tools/mapunit.hxx" #include "vos/mutex.hxx" #include "vos/ref.hxx" diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx index f795ff9b8c..99d683aadf 100644 --- a/xmloff/inc/xexptran.hxx +++ b/xmloff/inc/xexptran.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include diff --git a/xmloff/inc/xmlehelp.hxx b/xmloff/inc/xmlehelp.hxx index ed79312e68..f61b34e700 100644 --- a/xmloff/inc/xmlehelp.hxx +++ b/xmloff/inc/xmlehelp.hxx @@ -31,7 +31,7 @@ #ifndef _XMLOFF_XMLEHELP_HXX #define _XMLOFF_XMLEHELP_HXX -#include +#include namespace rtl { class OUStringBuffer; } diff --git a/xmloff/inc/xmloff/styleexp.hxx b/xmloff/inc/xmloff/styleexp.hxx index 6e53b3b87a..0d28a2e46d 100644 --- a/xmloff/inc/xmloff/styleexp.hxx +++ b/xmloff/inc/xmloff/styleexp.hxx @@ -36,7 +36,7 @@ #include #ifndef _VCL_MAPUNIT_HXX -//#include +//#include #endif #include diff --git a/xmloff/inc/xmloff/xmlexp.hxx b/xmloff/inc/xmloff/xmlexp.hxx index 635bb36d02..c6f048f71b 100644 --- a/xmloff/inc/xmloff/xmlexp.hxx +++ b/xmloff/inc/xmloff/xmlexp.hxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx index b69548595e..382aa311e4 100644 --- a/xmloff/inc/xmloff/xmlnume.hxx +++ b/xmloff/inc/xmloff/xmlnume.hxx @@ -32,7 +32,7 @@ #define _XMLOFF_XMLNUME_HXX #include -#include +#include #include #include diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx index 8f700ab824..0e173188b6 100644 --- a/xmloff/inc/xmloff/xmluconv.hxx +++ b/xmloff/inc/xmloff/xmluconv.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xmloff/source/core/xmlehelp.cxx b/xmloff/source/core/xmlehelp.cxx index aabd4b21f0..33a921caf0 100644 --- a/xmloff/source/core/xmlehelp.cxx +++ b/xmloff/source/core/xmlehelp.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include "xmlehelp.hxx" #ifndef _XMLOFF_XMTOKEN_HXX @@ -228,82 +227,6 @@ void SvXMLExportHelper::AddLength( sal_Int32 nValue, MapUnit eValueUnit, if( eUnit != XML_TOKEN_INVALID ) rOut.append( GetXMLToken(eUnit) ); -#if 0 - enum XMLTokenEnum eUnit; - sal_Int32 nFac = 1; - switch( eOutUnit ) - { - case MAP_100TH_MM: - nFac *= 10L; - case MAP_10TH_MM: - nFac *= 10L; - eOutUnit = MAP_MM; - case MAP_MM: - // 0.01mm - nFac *= 100L; - eUnit = XML_UNIT_MM; - break; - - case MAP_CM: -#ifdef EXACT_VALUES - // 0.001cm - nFac *= 1000L; -#else - // 0.01cm - nFac *= 100L; -#endif - eUnit = XML_UNIT_CM; - break; - - case MAP_TWIP: - case MAP_POINT: -#ifdef EXACT_VALUES - // 0.01pt - nFac *= 100L; -#else - // 0.1pt - nFac *= 10L; -#endif - eUnit = XML_UNIT_PT; - break; - - case MAP_1000TH_INCH: - nFac *= 10L; - case MAP_100TH_INCH: - nFac *= 10L; - case MAP_10TH_INCH: - nFac *= 10L; - case MAP_INCH: - default: - eOutUnit = MAP_INCH; -#ifdef EXACT_VALUES - // 0.0001in - nFac *= 10000L; -#else - // 0.01in - nFac *= 100L; -#endif - eUnit = XML_UNIT_INCH; - break; - } - - if( eValueUnit != eOutUnit ) - nValue = OutputDevice::LogicToLogic( nValue, eValueUnit, eOutUnit ); - - rOut.append( nValue / nFac ); - if( nFac > 1 && (nValue % nFac) != 0 ) - { - rOut.append( sal_Unicode('.') ); - while( nFac > 1 && (nValue % nFac) != 0 ) - { - nFac /= 10L; - rOut.append( (nValue / nFac) % 10L ); - } - } - - rOut.append( GetXMLToken(eUnit) ); -#endif - } void SvXMLExportHelper::AddPercentage( sal_Int32 nValue, OUStringBuffer& rOut ) diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx index 968cf5c6d2..1a612027a4 100644 --- a/xmloff/source/core/xmluconv.cxx +++ b/xmloff/source/core/xmluconv.cxx @@ -50,7 +50,7 @@ #endif #include -#include +#include // #110680# //#ifndef _COMPHELPER_PROCESSFACTORY_HXX_ diff --git a/xmloff/source/draw/shapeexport2.cxx b/xmloff/source/draw/shapeexport2.cxx index af04a6e533..ba90886a3e 100644 --- a/xmloff/source/draw/shapeexport2.cxx +++ b/xmloff/source/draw/shapeexport2.cxx @@ -55,7 +55,7 @@ #include #include "XMLImageMapExport.hxx" #include "xexptran.hxx" -#include // FRound +#include // FRound #include #include diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 67fb651b5b..7a992a65f2 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 8b6abaf992..3314e27400 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -58,14 +58,13 @@ #include /** === end UNO includes === **/ -#include // for check states +#include // for check states #include #include #include #include #include #include -#include // for check states #include #include #include diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index 90efb4b39c..c9911d3e47 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -46,7 +46,7 @@ #include #include #include -#include // for check states +#include // for check states #include //......................................................................... diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index 7c8a7152f7..81a1276708 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -55,7 +55,7 @@ #include #include #include -#include // for check states +#include // for check states #include #include #include "controlpropertymap.hxx" diff --git a/xmloff/source/style/EnumPropertyHdl.cxx b/xmloff/source/style/EnumPropertyHdl.cxx index aef435ada0..d9e7309dde 100644 --- a/xmloff/source/style/EnumPropertyHdl.cxx +++ b/xmloff/source/style/EnumPropertyHdl.cxx @@ -36,20 +36,6 @@ #include #include #include - -/* -#include -#include - -#ifndef _INC_LIMITS -#include -#endif - - -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ -#include -#endif -*/ #include using ::rtl::OUString; diff --git a/xmloff/source/style/XMLFontAutoStylePool.cxx b/xmloff/source/style/XMLFontAutoStylePool.cxx index 363393bd73..cbd6a5de0f 100644 --- a/xmloff/source/style/XMLFontAutoStylePool.cxx +++ b/xmloff/source/style/XMLFontAutoStylePool.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include #include -#include +#include #include "xmlnmspe.hxx" #include #include diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx index 5ad8d761ae..16a4d71636 100644 --- a/xmloff/source/style/fonthdl.cxx +++ b/xmloff/source/style/fonthdl.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #ifndef _XMLOFF_XMLEMENT_HXX #include diff --git a/xmloff/source/style/postuhdl.cxx b/xmloff/source/style/postuhdl.cxx index 622ef189b6..97a043a665 100644 --- a/xmloff/source/style/postuhdl.cxx +++ b/xmloff/source/style/postuhdl.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #ifndef _XMLOFF_XMLEMENT_HXX #include diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index 39585b04a3..261fbd0763 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #ifndef _INC_LIMITS diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx index 2c86ee70f0..37bfa76d3e 100644 --- a/xmloff/source/style/xmlnume.cxx +++ b/xmloff/source/style/xmlnume.cxx @@ -58,7 +58,7 @@ #include "XMLTextListAutoStylePool.hxx" #include #include -#include +#include using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx index 0c88e2d27b..312017ffda 100644 --- a/xmloff/source/style/xmlnumi.cxx +++ b/xmloff/source/style/xmlnumi.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx index cff7eee8d9..a9c4a0dfd3 100644 --- a/xmloff/source/text/txtprhdl.cxx +++ b/xmloff/source/text/txtprhdl.cxx @@ -32,7 +32,7 @@ #include "precompiled_xmloff.hxx" #include #include -#include +#include #include #include #include -- cgit v1.2.3 From 81f23216b506f1c6ce915c66abd3284254e69d5a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Oct 2009 13:22:39 +0200 Subject: #i103496#: move some fontsubstitution stuff from vcl to unotools to get xmloff vcl free --- svx/inc/pch/precompiled_svx.hxx | 2 +- svx/inc/svx/numitem.hxx | 2 +- svx/source/editeng/editobj.cxx | 2 +- svx/source/editeng/editobj2.hxx | 2 +- xmloff/inc/pch/precompiled_xmloff.hxx | 2 +- xmloff/source/core/xmlimp.cxx | 2 +- xmloff/util/makefile.mk | 3 --- 7 files changed, 6 insertions(+), 9 deletions(-) (limited to 'xmloff/inc') diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index aea1b42c8f..8b61566c26 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -927,7 +927,7 @@ #include "vcl/dndhelp.hxx" #include "vcl/fldunit.hxx" #include "vcl/fntstyle.hxx" -#include "vcl/fontcvt.hxx" +#include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx index b6734dc5a4..f65f76b8f1 100644 --- a/svx/inc/svx/numitem.hxx +++ b/svx/inc/svx/numitem.hxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include "svx/svxdllapi.h" class SvxBrushItem; diff --git a/svx/source/editeng/editobj.cxx b/svx/source/editeng/editobj.cxx index f0c9d0403f..496106efb0 100644 --- a/svx/source/editeng/editobj.cxx +++ b/svx/source/editeng/editobj.cxx @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include DBG_NAME( EE_EditTextObject ) diff --git a/svx/source/editeng/editobj2.hxx b/svx/source/editeng/editobj2.hxx index b37ceabbd7..ab8d1c9347 100644 --- a/svx/source/editeng/editobj2.hxx +++ b/svx/source/editeng/editobj2.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include class SfxStyleSheetPool; diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index 677b30bde2..06c27d0a71 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -470,7 +470,7 @@ #include "unotools/streamwrap.hxx" #include "tools/fldunit.hxx" -#include "vcl/fontcvt.hxx" +#include "unotools/fontcvt.hxx" #include "tools/mapunit.hxx" #include "vos/mutex.hxx" diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 1dc3caf249..e3b6ba6aa9 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include #include diff --git a/xmloff/util/makefile.mk b/xmloff/util/makefile.mk index 31852e1517..bc93c1d429 100644 --- a/xmloff/util/makefile.mk +++ b/xmloff/util/makefile.mk @@ -71,15 +71,12 @@ SHL1IMPLIB= _ixo SHL1USE_EXPORTS=name SHL1STDLIBS= \ - $(SVTOOLLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ $(VOSLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB)\ $(COMPHELPERLIB)\ - $(VCLLIB) \ - $(TKLIB) \ $(SVLLIB) \ $(SALLIB) \ $(UNOTOOLSLIB) \ -- cgit v1.2.3