diff options
Diffstat (limited to 'sc/source/ui')
149 files changed, 1239 insertions, 418 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index 8774ef74f86d..b611198974de 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -47,7 +47,7 @@ #include <unotools/accessiblestatesethelper.hxx> #endif #include <toolkit/helper/convert.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <comphelper/sequence.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/unohelp.hxx> diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 3ed9b4062a9d..2e6d9a256d75 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -583,7 +583,7 @@ sal_Bool ScChildrenShapes::IsSelected(sal_Int32 nIndex, bResult = maZOrderedShapes[nIndex]->bSelected; rShape = maZOrderedShapes[nIndex]->xShape; -#ifndef PRODUCT // test whether it is truly selected by a slower method +#ifdef DBG_UTIL // test whether it is truly selected by a slower method uno::Reference< drawing::XShape > xReturnShape; sal_Bool bDebugResult(sal_False); uno::Reference<container::XIndexAccess> xIndexAccess; @@ -1179,7 +1179,7 @@ sal_Bool ScChildrenShapes::FindShape(const uno::Reference<drawing::XShape>& xSha if ((rItr != maZOrderedShapes.end()) && (*rItr != NULL) && ((*rItr)->xShape.get() == xShape.get())) bResult = sal_True; // if the shape is found -#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted) +#ifdef DBG_UTIL // test whether it finds truly the correct shape (perhaps it is not really sorted) SortedShapes::iterator aDebugItr = maZOrderedShapes.begin(); SortedShapes::iterator aEndItr = maZOrderedShapes.end(); sal_Bool bFound(sal_False); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index a81f359f04c7..9801c9eeb972 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -1213,7 +1213,7 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& //UNUSED2008-05 if (rItr->mxShape.get() == xShape.get()) //UNUSED2008-05 bResult = sal_True; // if the shape is found //UNUSED2008-05 -//UNUSED2008-05 /*#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted) +//UNUSED2008-05 /*#ifdef DBG_UTIL // test whether it finds truly the correct shape (perhaps it is not really sorted) //UNUSED2008-05 ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape); //UNUSED2008-05 DBG_ASSERT(rItr == aDebugItr, "wrong Shape found"); //UNUSED2008-05 #endif*/ diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index fdb7696f7f6c..960e58760512 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -52,10 +52,10 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/window.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/accessiblestatesethelper.hxx> -#include <svtools/style.hxx> -#include <svtools/itempool.hxx> +#include <svl/style.hxx> +#include <svl/itempool.hxx> #include <svx/editobj.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx index ddb317ccc1b0..fabd1fc932cc 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx @@ -51,7 +51,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <vcl/window.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> #include <toolkit/helper/convert.hxx> diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index f4196896083b..0746495ca099 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -52,7 +52,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/window.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <comphelper/sequence.hxx> diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 53f063db0e66..88b3d42996f6 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -60,8 +60,8 @@ #include <svx/svdpage.hxx> #include <svx/svdxcgv.hxx> #include <sfx2/docfile.hxx> -#include <svtools/itempool.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/itempool.hxx> +#include <svl/urlbmk.hxx> #include <tools/urlobj.hxx> #include <vos/mutex.hxx> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 46987c88636f..c6901707d2c3 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -57,7 +57,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/sound.hxx> #include <unotools/localedatawrapper.hxx> #include <vcl/help.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index fd8009051ec4..a5b481d3174a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -52,7 +52,7 @@ #include <svx/scripttypeitem.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "inputwin.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 314f051881f1..89a51cd2b2b0 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -35,7 +35,7 @@ -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include "lnktrans.hxx" #include "scmod.hxx" diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index fb31b5601cf8..b9d8682c412b 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -56,8 +56,8 @@ #include <svtools/ehdl.hxx> #include <svtools/accessibilityoptions.hxx> -#include <svtools/ctloptions.hxx> -#include <svtools/useroptions.hxx> +#include <svl/ctloptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/status.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> @@ -66,7 +66,7 @@ #include <svx/langitem.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/selctrl.hxx> #include <svx/insctrl.hxx> #include <svx/zoomctrl.hxx> @@ -74,7 +74,7 @@ #include <svx/pszctrl.hxx> #include <svx/zoomsliderctrl.hxx> #include <vcl/msgbox.hxx> -#include <svtools/inethist.hxx> +#include <svl/inethist.hxx> #include <vcl/waitobj.hxx> #include <svx/svxerr.hxx> @@ -217,125 +217,128 @@ ScModule::~ScModule() } //------------------------------------------------------------------ - -void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 ) { - if ( rHint.ISA(SfxSimpleHint) ) + if ( p == pColorConfig || p == pAccessOptions ) { - ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); - if ( nHintId == SFX_HINT_DEINITIALIZING ) - { - // ConfigItems must be removed before ConfigManager - DeleteCfg(); - } - else if ( nHintId == SFX_HINT_COLORS_CHANGED || nHintId == SFX_HINT_ACCESSIBILITY_CHANGED ) + // Test if detective objects have to be updated with new colors + // (if the detective colors haven't been used yet, there's nothing to update) + if ( ScDetectiveFunc::IsColorsInitialized() ) { - // Test if detective objects have to be updated with new colors - // (if the detective colors haven't been used yet, there's nothing to update) - if ( ScDetectiveFunc::IsColorsInitialized() ) + const svtools::ColorConfig& rColors = GetColorConfig(); + BOOL bArrows = + ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor || + ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor ); + BOOL bComments = + ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor ); + if ( bArrows || bComments ) { - const svtools::ColorConfig& rColors = GetColorConfig(); - BOOL bArrows = - ( ScDetectiveFunc::GetArrowColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVE).nColor || - ScDetectiveFunc::GetErrorColor() != (ColorData)rColors.GetColorValue(svtools::CALCDETECTIVEERROR).nColor ); - BOOL bComments = - ( ScDetectiveFunc::GetCommentColor() != (ColorData)rColors.GetColorValue(svtools::CALCNOTESBACKGROUND).nColor ); - if ( bArrows || bComments ) - { - ScDetectiveFunc::InitializeColors(); // get the new colors + ScDetectiveFunc::InitializeColors(); // get the new colors - // update detective objects in all open documents - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); - while ( pObjSh ) + // update detective objects in all open documents + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + while ( pObjSh ) + { + if ( pObjSh->Type() == TYPE(ScDocShell) ) { - if ( pObjSh->Type() == TYPE(ScDocShell) ) - { - ScDocShell* pDocSh = ((ScDocShell*)pObjSh); - if ( bArrows ) - ScDetectiveFunc( pDocSh->GetDocument(), 0 ).UpdateAllArrowColors(); - if ( bComments ) - ScDetectiveFunc::UpdateAllComments( *pDocSh->GetDocument() ); - } - pObjSh = SfxObjectShell::GetNext( *pObjSh ); + ScDocShell* pDocSh = ((ScDocShell*)pObjSh); + if ( bArrows ) + ScDetectiveFunc( pDocSh->GetDocument(), 0 ).UpdateAllArrowColors(); + if ( bComments ) + ScDetectiveFunc::UpdateAllComments( *pDocSh->GetDocument() ); } + pObjSh = SfxObjectShell::GetNext( *pObjSh ); } } + } - // force all views to repaint, using the new options + // force all views to repaint, using the new options - SfxViewShell* pViewShell = SfxViewShell::GetFirst(); - while(pViewShell) + SfxViewShell* pViewShell = SfxViewShell::GetFirst(); + while(pViewShell) + { + if ( pViewShell->ISA(ScTabViewShell) ) { - if ( pViewShell->ISA(ScTabViewShell) ) - { - ScTabViewShell* pViewSh = (ScTabViewShell*)pViewShell; - pViewSh->PaintGrid(); - pViewSh->PaintTop(); - pViewSh->PaintLeft(); - pViewSh->PaintExtras(); - - ScInputHandler* pHdl = pViewSh->GetInputHandler(); - if ( pHdl ) - pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change - } - else if ( pViewShell->ISA(ScPreviewShell) ) - { - Window* pWin = pViewShell->GetWindow(); - if (pWin) - pWin->Invalidate(); - } - pViewShell = SfxViewShell::GetNext( *pViewShell ); + ScTabViewShell* pViewSh = (ScTabViewShell*)pViewShell; + pViewSh->PaintGrid(); + pViewSh->PaintTop(); + pViewSh->PaintLeft(); + pViewSh->PaintExtras(); + + ScInputHandler* pHdl = pViewSh->GetInputHandler(); + if ( pHdl ) + pHdl->ForgetLastPattern(); // EditEngine BackgroundColor may change + } + else if ( pViewShell->ISA(ScPreviewShell) ) + { + Window* pWin = pViewShell->GetWindow(); + if (pWin) + pWin->Invalidate(); } + pViewShell = SfxViewShell::GetNext( *pViewShell ); } - else if ( nHintId == SFX_HINT_CTL_SETTINGS_CHANGED ) + } + else if ( p == pCTLOptions ) + { + // for all documents: set digit language for printer, recalc output factor, update row heights + SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); + while ( pObjSh ) { - // for all documents: set digit language for printer, recalc output factor, update row heights - SfxObjectShell* pObjSh = SfxObjectShell::GetFirst(); - while ( pObjSh ) + if ( pObjSh->Type() == TYPE(ScDocShell) ) { - if ( pObjSh->Type() == TYPE(ScDocShell) ) - { - ScDocShell* pDocSh = ((ScDocShell*)pObjSh); - OutputDevice* pPrinter = pDocSh->GetPrinter(); - if ( pPrinter ) - pPrinter->SetDigitLanguage( GetOptDigitLanguage() ); + ScDocShell* pDocSh = ((ScDocShell*)pObjSh); + OutputDevice* pPrinter = pDocSh->GetPrinter(); + if ( pPrinter ) + pPrinter->SetDigitLanguage( GetOptDigitLanguage() ); - pDocSh->CalcOutputFactor(); + pDocSh->CalcOutputFactor(); - SCTAB nTabCount = pDocSh->GetDocument()->GetTableCount(); - for (SCTAB nTab=0; nTab<nTabCount; nTab++) - pDocSh->AdjustRowHeight( 0, MAXROW, nTab ); - } - pObjSh = SfxObjectShell::GetNext( *pObjSh ); + SCTAB nTabCount = pDocSh->GetDocument()->GetTableCount(); + for (SCTAB nTab=0; nTab<nTabCount; nTab++) + pDocSh->AdjustRowHeight( 0, MAXROW, nTab ); } + pObjSh = SfxObjectShell::GetNext( *pObjSh ); + } - // for all views (table and preview): update digit language - SfxViewShell* pSh = SfxViewShell::GetFirst(); - while ( pSh ) + // for all views (table and preview): update digit language + SfxViewShell* pSh = SfxViewShell::GetFirst(); + while ( pSh ) + { + if ( pSh->ISA( ScTabViewShell ) ) { - if ( pSh->ISA( ScTabViewShell ) ) - { - ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; + ScTabViewShell* pViewSh = (ScTabViewShell*)pSh; - // set ref-device for EditEngine (re-evaluates digit settings) - ScInputHandler* pHdl = GetInputHdl(pViewSh); - if (pHdl) - pHdl->UpdateRefDevice(); - - pViewSh->DigitLanguageChanged(); - pViewSh->PaintGrid(); - } - else if ( pSh->ISA( ScPreviewShell ) ) - { - ScPreviewShell* pPreviewSh = (ScPreviewShell*)pSh; - ScPreview* pPreview = pPreviewSh->GetPreview(); + // set ref-device for EditEngine (re-evaluates digit settings) + ScInputHandler* pHdl = GetInputHdl(pViewSh); + if (pHdl) + pHdl->UpdateRefDevice(); - pPreview->SetDigitLanguage( GetOptDigitLanguage() ); - pPreview->Invalidate(); - } + pViewSh->DigitLanguageChanged(); + pViewSh->PaintGrid(); + } + else if ( pSh->ISA( ScPreviewShell ) ) + { + ScPreviewShell* pPreviewSh = (ScPreviewShell*)pSh; + ScPreview* pPreview = pPreviewSh->GetPreview(); - pSh = SfxViewShell::GetNext( *pSh ); + pPreview->SetDigitLanguage( GetOptDigitLanguage() ); + pPreview->Invalidate(); } + + pSh = SfxViewShell::GetNext( *pSh ); + } + } +} + +void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) +{ + if ( rHint.ISA(SfxSimpleHint) ) + { + ULONG nHintId = ((SfxSimpleHint&)rHint).GetId(); + if ( nHintId == SFX_HINT_DEINITIALIZING ) + { + // ConfigItems must be removed before ConfigManager + DeleteCfg(); } } } @@ -354,17 +357,17 @@ void ScModule::DeleteCfg() if ( pColorConfig ) { - EndListening(*pColorConfig); + pColorConfig->RemoveListener(this); DELETEZ( pColorConfig ); } if ( pAccessOptions ) { - EndListening(*pAccessOptions); + pAccessOptions->RemoveListener(this); DELETEZ( pAccessOptions ); } if ( pCTLOptions ) { - EndListening(*pCTLOptions); + pCTLOptions->RemoveListener(this); DELETEZ( pCTLOptions ); } if( pUserOptions ) @@ -967,7 +970,7 @@ svtools::ColorConfig& ScModule::GetColorConfig() if ( !pColorConfig ) { pColorConfig = new svtools::ColorConfig; - StartListening(*pColorConfig); + pColorConfig->AddListener(this); } return *pColorConfig; @@ -978,7 +981,7 @@ SvtAccessibilityOptions& ScModule::GetAccessOptions() if ( !pAccessOptions ) { pAccessOptions = new SvtAccessibilityOptions; - StartListening(*pAccessOptions); + pAccessOptions->AddListener(this); } return *pAccessOptions; @@ -989,7 +992,7 @@ SvtCTLOptions& ScModule::GetCTLOptions() if ( !pCTLOptions ) { pCTLOptions = new SvtCTLOptions; - StartListening(*pCTLOptions); + pCTLOptions->AddListener(this); } return *pCTLOptions; diff --git a/sc/source/ui/app/scmod2.cxx b/sc/source/ui/app/scmod2.cxx index 4001ebe62036..7e0b43bdd156 100644 --- a/sc/source/ui/app/scmod2.cxx +++ b/sc/source/ui/app/scmod2.cxx @@ -36,7 +36,7 @@ //------------------------------------------------------------------ #include <svx/unolingu.hxx> -#include <svtools/lingucfg.hxx> +#include <unotools/lingucfg.hxx> #include <i18npool/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/linguistic2/XThesaurus.hpp> diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 94a2cdfc3324..c37fced30109 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -66,8 +66,8 @@ #include <svx/paperinf.hxx> #include <svx/sizeitem.hxx> #include <svx/algitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include "docsh.hxx" #include "markdata.hxx" #include "stlpool.hxx" diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index eedfab338844..1a36b8ca5125 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -64,8 +64,8 @@ #include <sfx2/msg.hxx> -#include <svtools/stritem.hxx> -#include <svtools/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/slstitm.hxx> #include <sfx2/objitem.hxx> #include <svx/fontitem.hxx> #include <svx/hlnkitem.hxx> @@ -80,7 +80,7 @@ #include <svx/colritem.hxx> #include <svx/boxitem.hxx> #include <svx/bolnitem.hxx> -#include <svtools/ptitem.hxx> +#include <svl/ptitem.hxx> #include <svx/sizeitem.hxx> #include <svx/algitem.hxx> #include <svx/clipfmtitem.hxx> @@ -117,15 +117,15 @@ #include <svx/charreliefitem.hxx> #include <svx/rotmodit.hxx> #include <svx/drawitem.hxx> -#include <svtools/ilstitem.hxx> -#include <svtools/globalnameitem.hxx> +#include <svl/ilstitem.hxx> +#include <svl/globalnameitem.hxx> #include <svx/chrtitem.hxx> #include <svx/zoomslideritem.hxx> // #i25616# #include <svx/sdshitm.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <avmedia/mediaitem.hxx> #include "attrib.hxx" diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 9fd600409211..05bcf624a1b3 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -45,7 +45,7 @@ //CHINA001 #include <svx/chardlg.hxx> //CHINA001 #include <svx/numfmt.hxx> //CHINA001 #include <svx/paragrph.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "tabpages.hxx" #include "attrdlg.hxx" diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 704546d76bf6..c08f8fa2dcea 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -33,7 +33,7 @@ #include <sfx2/dispatch.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include "tabvwsh.hxx" #include "reffact.hxx" diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 51641e0ce605..618c7f97a881 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -40,7 +40,7 @@ // INCLUDE --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewsh.hxx> diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index bb0e83746050..8e1f839c39e4 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -48,7 +48,7 @@ #ifndef _SV_GRADIENT_HXX #include <vcl/gradient.hxx> #endif -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objsh.hxx> #include <svx/zoomslideritem.hxx> diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index ddbfb4426df8..e33ecde514a4 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -37,7 +37,7 @@ #include <algorithm> #include <svtools/colorcfg.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <tools/poly.hxx> #include "scmod.hxx" #include "asciiopt.hxx" @@ -52,7 +52,7 @@ #include <svx/colritem.hxx> #include <svx/fhgtitem.hxx> #include <svx/fontitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "editutil.hxx" // *** edit engine *** @@ -96,12 +96,12 @@ ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : InitColors(); InitFonts(); ImplClearSplits(); - StartListening( mrColorConfig ); + mrColorConfig.AddListener(this); } ScCsvGrid::~ScCsvGrid() { - EndListening( mrColorConfig ); + mrColorConfig.RemoveListener(this); } @@ -995,14 +995,10 @@ void ScCsvGrid::DataChanged( const DataChangedEvent& rDCEvt ) ScCsvControl::DataChanged( rDCEvt ); } -void ScCsvGrid::Notify( SfxBroadcaster&, const SfxHint& rHint ) +void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - if( rHint.ISA( SfxSimpleHint ) && - (static_cast< const SfxSimpleHint& >( rHint ).GetId() == SFX_HINT_COLORS_CHANGED) ) - { - InitColors(); - Repaint(); - } + InitColors(); + Repaint(); } diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index d6bd29c7fddf..8a44d512cbe6 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -55,7 +55,7 @@ #define _PFILTDLG_CXX #include "pfiltdlg.hxx" #undef _PFILTDLG_CXX -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> //================================================================== diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 60c37ee19381..0065af288783 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -39,7 +39,7 @@ #include <svx/drawitem.hxx> #include <svx/xtable.hxx> #include <sfx2/objsh.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/msgbox.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 4351d357abb9..81e8ff35195d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -36,10 +36,10 @@ #endif #include <vcl/svapp.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> +#include <svl/aeitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> #include <basic/sbmeth.hxx> #include <basic/sbstar.hxx> #include <basic/sbmod.hxx> diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index fa00559b4f27..fc745318b105 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -40,7 +40,7 @@ #include <sfx2/fcontnr.hxx> #include <sfx2/sfxsids.hrc> #include <svx/linkmgr.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include "arealink.hxx" diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index f9039a88f658..e292187c80c9 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -48,8 +48,8 @@ #include <vcl/sound.hxx> #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/PasswordHelper.hxx> +#include <svl/zforlist.hxx> +#include <svl/PasswordHelper.hxx> #include <list> diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index fd67755daf83..17cb07ca0a49 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -42,7 +42,7 @@ #include <sot/clsids.hxx> -#include <svtools/securityoptions.hxx> +#include <unotools/securityoptions.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> #include <tools/urlobj.hxx> @@ -51,7 +51,7 @@ #include <vcl/waitobj.hxx> #include <svtools/ctrltool.hxx> #include <svtools/sfxecode.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dinfdlg.hxx> @@ -63,10 +63,9 @@ #include <sfx2/topfrm.hxx> #include <sfx2/objface.hxx> #include <svx/srchitem.hxx> -#include <svx/svxmsbas.hxx> -#include <svtools/fltrcfg.hxx> -#include <svtools/documentlockfile.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <unotools/fltrcfg.hxx> +#include <svl/documentlockfile.hxx> +#include <svl/sharecontrolfile.hxx> #include <unotools/charclass.hxx> #include <vcl/virdev.hxx> #include "chgtrack.hxx" diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 742d66e6bcb9..386ac8528cec 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -43,7 +43,7 @@ #include <svx/flstitem.hxx> #include <svx/drawitem.hxx> #include <sfx2/printer.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 380f4635cdcf..1416c57f1165 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -44,13 +44,11 @@ #include <svx/pageitem.hxx> #include <svx/paperinf.hxx> #include <svx/postattr.hxx> -//#include <svx/postdlg.hxx> #include <svx/sizeitem.hxx> - +#include <unotools/misccfg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> -#include <svtools/misccfg.hxx> #include <sfx2/printer.hxx> #include <svtools/ctrltool.hxx> #include <vcl/virdev.hxx> @@ -443,7 +441,7 @@ void ScDocShell::InitOptions() // Fortsetzung von InitNew (CLOOKs) aDocOpt.SetAutoSpell( bAutoSpell ); // zweistellige Jahreszahleneingabe aus Extras->Optionen->Allgemein->Sonstiges - aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( SFX_APP()->GetMiscConfig()->GetYear2000() ) ); + aDocOpt.SetYear2000( sal::static_int_cast<USHORT>( ::utl::MiscCfg().GetYear2000() ) ); aDocument.SetDocOptions( aDocOpt ); aDocument.SetViewOptions( aViewOpt ); @@ -968,7 +966,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck // -> wird weggelassen //! ??? Loesch-Aktion rueckgaengig machen ??? //! ??? Aktion irgendwo anders speichern ??? -#ifndef PRODUCT +#ifdef DBG_UTIL String aValue; if ( eSourceType == SC_CAT_CONTENT ) ((const ScChangeActionContent*)pSourceAction)->GetNewString( aValue ); @@ -1126,7 +1124,7 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck ScChangeAction* pAct = pThisTrack->GetLast(); if ( pAct && pAct->GetActionNumber() > nOldActionMax ) pAct->SetComment( rComment ); -#ifndef PRODUCT +#ifdef DBG_UTIL else DBG_ERROR( "MergeDocument: wohin mit dem Kommentar?!?" ); #endif diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 80b0c76a64be..4827366d3924 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -60,7 +60,7 @@ using namespace ::com::sun::star; #include <svx/ofaitem.hxx> #include <sot/formats.hxx> #include <svtools/printdlg.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/waitobj.hxx> #include <tools/multisel.hxx> @@ -73,9 +73,9 @@ using namespace ::com::sun::star; #include <sfx2/passwd.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docinsert.hxx> -#include <svtools/PasswordHelper.hxx> -#include <svtools/documentlockfile.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/PasswordHelper.hxx> +#include <svl/documentlockfile.hxx> +#include <svl/sharecontrolfile.hxx> #include <comphelper/processfactory.hxx> #include "docuno.hxx" diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 5b2da76475df..b4b5f4721900 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -42,7 +42,7 @@ #include <vcl/waitobj.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index d58777b9b5d5..174207bbf673 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -37,8 +37,8 @@ #include <stdio.h> #include <tools/urlobj.hxx> -#include <svtools/converter.hxx> -#include <svtools/zforlist.hxx> +#include <svl/converter.hxx> +#include <svl/zforlist.hxx> #include <comphelper/types.hxx> #include <ucbhelper/content.hxx> #include <unotools/sharedunocomponent.hxx> diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index f74e8c519fb6..e18ef20d96b9 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -55,12 +55,12 @@ #include "sfx2/fcontnr.hxx" #include "sfx2/sfxsids.hrc" #include "sfx2/objsh.hxx" -#include "svtools/broadcast.hxx" -#include "svtools/smplhint.hxx" -#include "svtools/itemset.hxx" -#include "svtools/stritem.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/zformat.hxx" +#include "svl/broadcast.hxx" +#include "svl/smplhint.hxx" +#include "svl/itemset.hxx" +#include "svl/stritem.hxx" +#include "svl/urihelper.hxx" +#include "svl/zformat.hxx" #include "svx/linkmgr.hxx" #include "tools/urlobj.hxx" #include "unotools/ucbhelper.hxx" diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 1561e4c6efeb..25a1c867b0e3 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -53,9 +53,9 @@ class StarBASIC; #include <tools/string.hxx> #include <rtl/math.hxx> #include <svtools/htmlout.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <sot/formats.hxx> #include <sfx2/mieclip.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 570d41f7885d..c86c7591cd36 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -42,8 +42,8 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> -#include <svtools/itemset.hxx> -#include <svtools/stritem.hxx> +#include <svl/itemset.hxx> +#include <svl/stritem.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 7bb3c92dbc9c..e4d39e21d7be 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -44,7 +44,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "chartsh.hxx" diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index 63f958763479..e53fea436d12 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -48,7 +48,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "drawsh.hxx" @@ -71,7 +71,7 @@ #include "userdat.hxx" #include <sfx2/objsh.hxx> -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <sfx2/evntconf.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/util/XModifiable.hpp> @@ -266,7 +266,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView, RID_SVXDLG_CAPTION ); + SfxAbstractTabDialog *pDlg = pFact->CreateCaptionDialog( pWin, pView ); const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); @@ -291,7 +291,7 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - SfxAbstractTabDialog* pDlg = pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView, RID_SVXDLG_TRANSFORM ); + SfxAbstractTabDialog* pDlg = pFact->CreateSvxTransformTabDialog( pWin, &aNewAttr,pView ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 if (pDlg->Execute() == RET_OK) { @@ -398,7 +398,6 @@ void ScDrawShell::ExecuteLineDlg( SfxRequest& rReq, USHORT nTabPage ) SfxAbstractTabDialog * pDlg = pFact->CreateSvxLineTabDialog( pViewData->GetDialogParent(), &aNewAttr, pViewData->GetDocument()->GetDrawLayer(), - RID_SVXDLG_LINE, pObj, bHasMarked); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 @@ -439,7 +438,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, USHORT nTabPage ) AbstractSvxAreaTabDialog * pDlg = pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(), &aNewAttr, pViewData->GetDocument()->GetDrawLayer(), - RID_SVXDLG_AREA, pView); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 @@ -477,7 +475,7 @@ void ScDrawShell::ExecuteTextAttrDlg( SfxRequest& rReq, USHORT /* nTabPage */ ) pView->MergeAttrFromMarked( aNewAttr, FALSE ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, RID_SVXDLG_TEXT, pView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aNewAttr, pView ); USHORT nResult = pDlg->Execute(); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 4507bc471ebc..ad36ad72e796 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -42,8 +42,8 @@ #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/ptitem.hxx> +#include <svl/whiter.hxx> #include <svx/svdobj.hxx> #include <svx/svdouno.hxx> #include <svx/extrusionbar.hxx> diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 26e5e6cb9b2e..5d8e4cb1ca33 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -522,7 +522,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName, RID_SVXDLG_OBJECT_NAME); + AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName); OSL_ENSURE(pDlg, "Dialogdiet fail!"); pDlg->SetCheckNameHdl(LINK(this, ScDrawShell, NameObjectHdl)); @@ -593,7 +593,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "Dialogdiet fail!"); - AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription, RID_SVXDLG_OBJECT_TITLE_DESC); + AbstractSvxObjectTitleDescDialog* pDlg = pFact->CreateSvxObjectTitleDescDialog(NULL, aTitle, aDescription); OSL_ENSURE(pDlg, "Dialogdiet fail!"); if(RET_OK == pDlg->Execute()) diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 5e4d5640f74a..8987c9194cb2 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -45,7 +45,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "drformsh.hxx" diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index d241843f9745..908eba68cee5 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -65,8 +65,8 @@ #include <sfx2/viewfrm.hxx> #include <svtools/cliplistener.hxx> #include <svtools/transfer.hxx> -#include <svtools/whiter.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/whiter.hxx> +#include <svl/languageoptions.hxx> #include <vcl/msgbox.hxx> #include <svx/svxdlg.hxx> @@ -799,7 +799,7 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq ) case SID_DRAWTEXT_ATTR_DLG: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, RID_SVXDLG_TEXT, pView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( pViewData->GetDialogParent(), &aEditAttr, pView ); bDone = ( RET_OK == pDlg->Execute() ); diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index d05e0568c1ca..3389c362901b 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -45,7 +45,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <sot/formats.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include "sc.hrc" #include "drtxtob.hxx" diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index fd6fc1ff3e41..0398d5a63b43 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -36,7 +36,7 @@ #include <svx/gallery.hxx> #include <sfx2/request.hxx> #include <svx/fmmodel.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> #include <svx/eeitem.hxx> diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 3274b6752c95..35d46f234182 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svtools/filter.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <tools/urlobj.hxx> #include <avmedia/mediawindow.hxx> diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 93abbd48c9e7..1f7534a7fcb4 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -40,16 +40,16 @@ #include <toolkit/helper/vclunohelper.hxx> #include <sot/exchange.hxx> -#include <svtools/globalnameitem.hxx> +#include <svl/globalnameitem.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/svdoole2.hxx> #include <svx/pfiledlg.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> -#include <svtools/urihelper.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/urihelper.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/insdlg.hxx> #include <svtools/soerr.hxx> #include <svx/svxdlg.hxx> diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index ebcb2ad30802..a96ce6c18980 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -44,7 +44,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/svxids.hrc> #include <svx/eeitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "futext.hxx" #include "drwlayer.hxx" diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx index 39b27609e3a8..34c32fb8bc08 100644 --- a/sc/source/ui/drawfunc/graphsh.cxx +++ b/sc/source/ui/drawfunc/graphsh.cxx @@ -38,7 +38,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/svdograf.hxx> #include <svx/grfflt.hxx> #include <svx/grafctrl.hxx> diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index 16dcfd9f1cf7..9469cd43c96e 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -35,7 +35,7 @@ #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <avmedia/mediaitem.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <svx/svdomedia.hxx> #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index a0c5bd6d818f..c9da807019c9 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -45,7 +45,7 @@ #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "oleobjsh.hxx" diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 8d631a9f0609..f9146b96c04c 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -39,8 +39,8 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <sfx2/objsh.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/stritem.hxx> #include <svtools/svtreebx.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/topfrm.hxx> diff --git a/sc/source/ui/inc/AccessibilityHints.hxx b/sc/source/ui/inc/AccessibilityHints.hxx index 8448654014c7..e89069ade49a 100644 --- a/sc/source/ui/inc/AccessibilityHints.hxx +++ b/sc/source/ui/inc/AccessibilityHints.hxx @@ -33,8 +33,8 @@ #include "viewdata.hxx" #include <com/sun/star/uno/XInterface.hpp> -#include <svtools/smplhint.hxx> -#include <svtools/hint.hxx> +#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #define SC_HINT_ACC_SIMPLE_START SFX_HINT_USER00 #define SC_HINT_ACC_TABLECHANGED SC_HINT_ACC_SIMPLE_START + 1 diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 8d312a0d13d9..98f2afc8e88d 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -50,7 +50,7 @@ #include <cppuhelper/interfacecontainer.h> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/servicehelper.hxx> diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 7bb71854443c..fac00ea550e4 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -32,7 +32,7 @@ #define _SC_DRAWMODELBROADCASTER_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/document/XEventBroadcaster.hpp> diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 7986935ae9c3..cdde064fc588 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -55,7 +55,7 @@ #ifndef _SVARRAY_HXX #define _SVARRAY_HXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #endif #include "chgtrack.hxx" #include "chgviset.hxx" diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index c8c633060852..583c4fd2c414 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -34,10 +34,8 @@ #define _SC_CSVGRID_HXX #include <vcl/virdev.hxx> -#ifndef _MENU_HXX #include <vcl/menu.hxx> -#endif -#include <svtools/lstner.hxx> +#include <unotools/options.hxx> #include <vector> #include <memory> @@ -100,7 +98,7 @@ typedef ::std::vector< ScCsvColState > ScCsvColStateVec; /** A data grid control for the CSV import dialog. The design of this control simulates a Calc spreadsheet with row and column headers. */ -class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public SfxListener +class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener { private: typedef ::std::auto_ptr< ScEditEngineDefaulter > ScEditEnginePtr; @@ -299,8 +297,7 @@ protected: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - using Control::Notify; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); // painting --------------------------------------------------------------- protected: diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 068a05d57711..6a468a415b44 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -32,7 +32,7 @@ #include <sfx2/childwin.hxx> #include <sfx2/dockwin.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svtools/stdctrl.hxx> #ifndef _LSTBOX_HXX //autogen diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b25811eb9220..d490e37b93ca 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -44,7 +44,7 @@ #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include "compiler.hxx" diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 753000e290ab..fc8f1813be56 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -44,7 +44,7 @@ #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <vcl/tabctrl.hxx> diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index bded402f5775..a5b7c4d94e5f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -34,7 +34,7 @@ #include <vector> #include <vcl/toolbox.hxx> #include <sfx2/childwin.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <vcl/combobox.hxx> #include <vcl/window.hxx> #include <svtools/transfer.hxx> diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 954d0d7a5d47..44514766601d 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -35,9 +35,9 @@ #include <svx/srchitem.hxx> -#include <svtools/itempool.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/itempool.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> //#include <dbitems.hxx> #include "uiitems.hxx" diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 54434427d459..b14e668fabd0 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -36,8 +36,8 @@ #include <vcl/field.hxx> #include <vcl/lstbox.hxx> #include <svtools/stdctrl.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/lstner.hxx> +#include <svl/poolitem.hxx> +#include <svl/lstner.hxx> #include <sfx2/childwin.hxx> #include "content.hxx" #include <svtools/svmedit.hxx> diff --git a/sc/source/ui/inc/parawin.hxx b/sc/source/ui/inc/parawin.hxx index 3835f94157ca..087c8937de9d 100644 --- a/sc/source/ui/inc/parawin.hxx +++ b/sc/source/ui/inc/parawin.hxx @@ -44,7 +44,7 @@ #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <vcl/tabctrl.hxx> diff --git a/sc/source/ui/inc/servobj.hxx b/sc/source/ui/inc/servobj.hxx index 0eca2cfafaf1..7cd6c04bc91e 100644 --- a/sc/source/ui/inc/servobj.hxx +++ b/sc/source/ui/inc/servobj.hxx @@ -31,8 +31,8 @@ #ifndef SC_SERVOBJ_HXX #define SC_SERVOBJ_HXX -#include <svtools/lstner.hxx> -#include <svtools/listener.hxx> +#include <svl/lstner.hxx> +#include <svl/listener.hxx> #include <sfx2/linksrc.hxx> #include "global.hxx" #include "address.hxx" diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index eb3b5f346ccb..1e65821915f3 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -31,7 +31,7 @@ #ifndef SC_TARGET_HXX #define SC_TARGET_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class ScTabViewShell; diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 0132ec844233..ba1370b1960f 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -39,7 +39,7 @@ #include <vcl/window.hxx> #endif #ifndef _SFXPOOLITEM_HXX //autogen -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #endif #ifndef _SFXTBXCTRL_HXX //autogen #include <sfx2/tbxctrl.hxx> diff --git a/sc/source/ui/inc/ui_pch.hxx b/sc/source/ui/inc/ui_pch.hxx index 335f7e917505..d9b21fd2f0d4 100644 --- a/sc/source/ui/inc/ui_pch.hxx +++ b/sc/source/ui/inc/ui_pch.hxx @@ -43,7 +43,7 @@ #include <tools/solar.h> #include <tools/string.hxx> -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #include <tools/rtti.hxx> #include <string.h> #include <tools/contnr.hxx> @@ -53,9 +53,9 @@ #include <tools/link.hxx> #include <i18npool/lang.h> #include <sfx2/sfx.hrc> -#include <svtools/memberid.hrc> +#include <svl/memberid.hrc> #include <sfx2/sfxsids.hrc> -#include <svtools/cntwids.hrc> +#include <svl/cntwids.hrc> #include <tools/resid.hxx> #include <tools/rc.hxx> #include <tools/resmgr.hxx> @@ -95,28 +95,28 @@ #include <global.hxx> #include <vcl/syswin.hxx> #include <tools/debug.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <vcl/ctrl.hxx> -#include <svtools/hint.hxx> -#include <svtools/poolitem.hxx> +#include <svl/hint.hxx> +#include <svl/poolitem.hxx> #include <vcl/image.hxx> #include <vcl/timer.hxx> #include <tools/unqidx.hxx> #include <vcl/symbol.hxx> #include <vcl/fixed.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <vcl/timer.hxx> #include <sc.hrc> #include <stdarg.h> #include <svx/dialogs.hrc> #include <basic/sbxdef.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/shell.hxx> #include <vcl/window.hxx> #include <vcl/group.hxx> #include <tools/unqid.hxx> #include <tools/table.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <rangelst.hxx> @@ -127,15 +127,15 @@ #include <vcl/spinfld.hxx> #include <vcl/combobox.hxx> #include <tools/pstm.hxx> -#include <svtools/eitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/eitem.hxx> +#include <svl/itempool.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/tabdlg.hxx> #include <vcl/tabpage.hxx> #include <vcl/tabctrl.hxx> #include <shellids.hxx> #include <vcl/event.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svtools/confitem.hxx> #include <markdata.hxx> #include <svx/optgrid.hxx> @@ -150,7 +150,7 @@ #include <column.hxx> #include <markarr.hxx> #include <vcl/mapmod.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <vcl/seleng.hxx> #include <rsc/rscsfx.hxx> #include <svx/zoomitem.hxx> @@ -165,23 +165,23 @@ #include <sfx2/module.hxx> #include <dbfunc.hxx> #include <vcl/accel.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <sfx2/viewfac.hxx> #include <sot/storage.hxx> #include <sfx2/objsh.hxx> #include <target.hxx> #include <tabvwsh.hxx> -#include <svtools/inethist.hxx> -#include <svtools/inetdef.hxx> +#include <svl/inethist.hxx> +#include <svl/inetdef.hxx> #include <sfx2/sfxdefs.hxx> -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <svtools/compat.hxx> -#include <svtools/inetmsg.hxx> +#include <svl/inetmsg.hxx> #include <sfx2/app.hxx> #include <tools/urlobj.hxx> #include <scdll.hxx> #include <sfx2/msg.hxx> -#include <svtools/ownlist.hxx> +#include <svl/ownlist.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/frame.hxx> @@ -207,9 +207,9 @@ #include <svx/svdtypes.hxx> #include <vcl/btndlg.hxx> #include <vcl/svapp.hxx> -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <vcl/edit.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <collect.hxx> #include <svx/svdsob.hxx> #include <vcl/imagebtn.hxx> @@ -300,7 +300,7 @@ #include <cell.hxx> #include <stddef.h> #include <tools/mempool.hxx> -#include <svtools/style.hrc> +#include <svl/style.hrc> #include <drawview.hxx> #include <svx/view3d.hxx> #include <svx/def3d.hxx> @@ -310,7 +310,7 @@ #include <svx/svxenum.hxx> #include <svx/xtextit0.hxx> #include <svx/svdtrans.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <reffact.hxx> #include <svx/svdotext.hxx> #include <svx/svdoattr.hxx> @@ -326,7 +326,7 @@ #include <vcl/button.hxx> #include <svx/srchitem.hxx> #include <svx/svdorect.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <stlpool.hxx> #include <svx/eeitem.hxx> #include <inputhdl.hxx> diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 868e772a2e68..bfa1603adb80 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -35,7 +35,7 @@ #include "conditio.hxx" #include "sortparam.hxx" #include "paramisc.hxx" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class ScEditEngineDefaulter; class EditTextObject; diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 2d3ee1d14dd7..8398b030ed68 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -31,7 +31,7 @@ #ifndef SC_UNDOBASE_HXX #define SC_UNDOBASE_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include "global.hxx" #include "address.hxx" diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 7b5d59fbb620..5ded731d5105 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -31,7 +31,7 @@ #ifndef SC_UNDODRAW_HXX #define SC_UNDODRAW_HXX -#include <svtools/undo.hxx> +#include <svl/undo.hxx> class ScDocShell; diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index a7cf0d094d6b..40177a31e68e 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -39,14 +39,14 @@ #ifndef _SVSTDARR_SHORTS #define _SVSTDARR_SHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 066aadca817a..82ddc0bad026 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -34,14 +34,14 @@ #ifndef _SVSTDARR_SHORTS #define _SVSTDARR_SHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #ifndef _SVSTDARR_STRINGS #define _SVSTDARR_STRINGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include <com/sun/star/embed/XEmbeddedObject.hpp> diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 76330036b1f5..ab2cdaba3b69 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -35,7 +35,7 @@ -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <unotools/textsearch.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index b4fe1f83b220..fb29b6d673ca 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -49,7 +49,7 @@ #include <svx/wghtitem.hxx> #include <sfx2/topfrm.hxx> #include <vcl/svapp.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index e6a8746a01be..f013c334bf37 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -37,7 +37,7 @@ //---------------------------------------------------------------------------- -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <limits.h> diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 97cc29ac3e54..8783df43d3df 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -37,7 +37,7 @@ #include "scitems.hxx" #include <sfx2/bindings.hxx> #include <sfx2/imagemgr.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index af450fdcc6ab..dd1c312cd792 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -49,7 +49,7 @@ ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, RID_SVXDLG_POSTIT, bPrevNext, TRUE ); + pDlg = pFact->CreateSvxPostItDialog( pParent, rCoreSet, bPrevNext, TRUE ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 pDocShell=pShell; pDlg->DontChangeAuthor(); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index e1ec71344034..32c49cf2a3ad 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -49,7 +49,7 @@ #include <svx/shdditem.hxx> #include <svx/udlnitem.hxx> #include <svx/wghtitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <comphelper/processfactory.hxx> diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ec93346e1fed..f9893f1d3faa 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -34,8 +34,8 @@ //----------------------------------------------------------------------------- #include <osl/security.hxx> -#include <svtools/sharecontrolfile.hxx> -#include <svtools/useroptions.hxx> +#include <svl/sharecontrolfile.hxx> +#include <unotools/useroptions.hxx> #include <docsh.hxx> diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index b5fc7d8d322a..091329f1d03b 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -38,7 +38,7 @@ #include "rangelst.hxx" #include "scitems.hxx" #include <sfx2/dispatch.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include "uiitems.hxx" diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index c204266bbb60..a12ad4992bff 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -46,13 +46,13 @@ //CHINA001 #include <svx/paragrph.hxx> //CHINA001 #include <svx/tabstpge.hxx> #include <sfx2/objsh.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> #include "textdlgs.hxx" #include "scresid.hxx" #include "sc.hrc" #include <svx/svxids.hrc> //add CHINA001 -#include <svtools/intitem.hxx> //add CHINA001 +#include <svl/intitem.hxx> //add CHINA001 #include <svx/flagsdef.hxx> //CHINA001 // ----------------------------------------------------------------------- diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index af3b5f0dee5e..8198e6adb0f4 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -46,7 +46,7 @@ #include <vcl/sound.hxx> #include <vcl/svapp.hxx> #include <tools/urlobj.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <stdlib.h> #include "content.hxx" diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 60f6c708e08c..c3807844270a 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -35,8 +35,8 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/intitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include "navcitem.hxx" #include "global.hxx" diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 6e3fbaa86cc0..0a216dac3709 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -41,8 +41,8 @@ #include <sfx2/event.hxx> #include <sfx2/imgmgr.hxx> #include <sfx2/navigat.hxx> -#include <svtools/stritem.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/stritem.hxx> +#include <svl/urlbmk.hxx> #include <vcl/sound.hxx> #include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 55f26b682034..c03e5efc82bd 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -38,8 +38,8 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> #include "navipi.hxx" diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 498dbed85285..d6e8a3ae5009 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -33,7 +33,7 @@ #undef SC_DLLIMPLEMENTATION -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "tpprint.hxx" #include "printopt.hxx" diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 17c00948d3bd..f65105b0a687 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -37,7 +37,7 @@ #include <rangelst.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <unotools/charclass.hxx> #include <stdlib.h> diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 695ede732edd..7ab719e3e10b 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -38,7 +38,7 @@ //------------------------------------------------------------------ #include "scitems.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "hfedtdlg.hxx" #include "global.hxx" diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 70232e2827f1..e55c8405fc34 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -50,9 +50,9 @@ #include <sfx2/objsh.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> //CHINA001 #include "tphfedit.hxx" #include "editutil.hxx" diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 5ba7a485ede8..58e5570aa01b 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -40,7 +40,7 @@ #define _TPHF_CXX #include "scitems.hxx" #include <sfx2/basedlgs.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src index fb3890616aa0..fa883f593095 100644 --- a/sc/source/ui/src/globstr.src +++ b/sc/source/ui/src/globstr.src @@ -1657,7 +1657,7 @@ Resource RID_GLOBSTR String STR_UNDO_CHINESE_TRANSLATION { - Text [ en-US ] = "Chinese translation"; + Text [ en-US ] = "Chinese conversion"; }; String STR_ERR_DATAPILOT_INPUT diff --git a/sc/source/ui/styleui/scstyles.src b/sc/source/ui/styleui/scstyles.src index 4eead4a953f2..9c367b9daf7f 100644 --- a/sc/source/ui/styleui/scstyles.src +++ b/sc/source/ui/styleui/scstyles.src @@ -29,7 +29,7 @@ ************************************************************************/ #include "sc.hrc" -#include <svtools/style.hrc> +#include <svl/style.hrc> #define IMPL_FAMILY(family,filter) \ StyleFamily = family; \ FilterList = { filter } diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 71066ec27ec3..ea94566b918f 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -47,8 +47,8 @@ //CHINA001 #include <svx/page.hxx> //CHINA001 #include <svx/paragrph.hxx> #include <sfx2/objsh.hxx> -#include <svtools/style.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/style.hxx> +#include <svl/cjkoptions.hxx> #include "styledlg.hxx" #include "tabpages.hxx" // Zellvorlagen @@ -60,9 +60,9 @@ #include <svx/svxdlg.hxx> //CHINA001 #include <svx/svxids.hrc> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 -#include <svtools/intitem.hxx> //CHINA001 +#include <svl/intitem.hxx> //CHINA001 #include <svx/flstitem.hxx> //CHINA001 -#include <svtools/aeitem.hxx> //CHINA001 +#include <svl/aeitem.hxx> //CHINA001 #include <svx/flagsdef.hxx> //CHINA001 //================================================================== diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index eb23516cafeb..87f83ce7a932 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -35,7 +35,7 @@ #include <svx/eeitem.hxx> #include <svx/editobj.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/app.hxx> #include "undocell.hxx" diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 01c561e96c83..7e7f3db1d42c 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -35,7 +35,7 @@ // INCLUDE --------------------------------------------------------------- -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/virdev.hxx> #include "undostyl.hxx" diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index ce428311d3f8..0fc638b7825e 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -46,7 +46,7 @@ #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "undotab.hxx" #include "document.hxx" diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index a3b026396942..9661335bbf35 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/table/CellAddress.hpp> #include <com/sun/star/table/CellRangeAddress.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "docsh.hxx" #include "unonames.hxx" diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index d7f1eb13c1b2..e4b9ef8a8765 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -36,7 +36,7 @@ #include "scitems.hxx" #include <tools/debug.hxx> #include <tools/shl.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/unomid.hxx> #include "unowids.hxx" #include <rtl/uuid.h> diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index f3418a84e2ef..babccf9a7053 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -50,8 +50,8 @@ #include <svx/unotext.hxx> #include <svx/svdpage.hxx> #include <sfx2/bindings.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <rtl/uuid.h> #include <float.h> // DBL_MIN diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 3c584a94a775..d66600df4243 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -44,7 +44,7 @@ #include <svx/svdpage.hxx> #include <svx/svdundo.hxx> #include <sfx2/app.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <sot/clsids.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index b6dacccec334..99c907113bb8 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -34,8 +34,8 @@ #include "scitems.hxx" -#include <svtools/intitem.hxx> -#include <svtools/zforlist.hxx> +#include <svl/intitem.hxx> +#include <svl/zforlist.hxx> #include <rtl/uuid.h> #include "cursuno.hxx" diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index c68baf36ba2b..ed40d2f5c96a 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -32,7 +32,7 @@ #include "precompiled_sc.hxx" #include <algorithm> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <rtl/uuid.h> #include "dapiuno.hxx" diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 13f2c26c6e47..0dd364812d48 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -34,8 +34,8 @@ #include <tools/debug.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/zforlist.hxx> +#include <svl/smplhint.hxx> +#include <svl/zforlist.hxx> #include <rtl/uuid.h> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index bc6f135ce174..3df667faad8c 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -33,8 +33,8 @@ -#include <svtools/smplhint.hxx> -#include <svtools/itemprop.hxx> +#include <svl/smplhint.hxx> +#include <svl/itemprop.hxx> #include <svx/unomid.hxx> #include <i18npool/mslangid.hxx> diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 1e2309dd2c0a..99bce5579e14 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -36,7 +36,7 @@ #include <sfx2/viewfrm.hxx> #include <comphelper/uno3.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 7bb4f2b45f77..5f4f1a7aa93f 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -40,9 +40,9 @@ #include <svx/svdpage.hxx> #include <svx/svxids.hrc> -#include <svtools/numuno.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/undoopt.hxx> +#include <svl/numuno.hxx> +#include <svl/smplhint.hxx> +#include <unotools/undoopt.hxx> #include <sfx2/printer.hxx> #include <sfx2/bindings.hxx> #include <vcl/pdfextoutdevdata.hxx> diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 94078ff91af4..8fd4bba512eb 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/eeitem.hxx> diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index a50b4003b0ac..a60bb836b142 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -35,7 +35,7 @@ #include <tools/debug.hxx> #include <sfx2/app.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "funcuno.hxx" #include "miscuno.hxx" diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 0a07b057740b..ddb5dc3b0496 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -33,7 +33,7 @@ -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <svx/linkmgr.hxx> #include "linkuno.hxx" diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 536e1f2a1a65..ab8576949b75 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -33,7 +33,7 @@ -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <com/sun/star/sheet/NamedRangeFlag.hpp> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index e44dab865d46..8477d1f17779 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sc.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "rangelst.hxx" diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 8c3deefba6d5..f7c8d2827f50 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -33,7 +33,7 @@ -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <com/sun/star/util/Date.hpp> diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6ed8181091ac..4600244cf2df 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -64,10 +64,10 @@ #include <svtools/parhtml.hxx> #include <rtl/ustring.h> #include <rtl/logfile.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/window.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <tools/urlobj.hxx> #include <vos/mutex.hxx> #include <svtools/sfxecode.hxx> diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 12cbdbdde1a1..941f586a73c9 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -45,10 +45,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/printer.hxx> #include <vcl/virdev.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/intitem.hxx> -#include <svtools/zformat.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/intitem.hxx> +#include <svl/zformat.hxx> #include <rtl/uuid.h> #include <com/sun/star/table/BorderLine.hpp> diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index f3fcb8c6d671..7d291235559a 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -37,8 +37,8 @@ #include <vcl/virdev.hxx> //#include <toolkit/unoiface.hxx> #include <toolkit/unohlp.hxx> -#include <svtools/itemprop.hxx> -#include <svtools/smplhint.hxx> +#include <svl/itemprop.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index e6e194d7eb75..9d31b15fdf47 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/sheet/AddressConvention.hpp> #include <com/sun/star/table/CellAddress.hpp> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include "miscuno.hxx" #include "convuno.hxx" diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index 6b11ac7c6641..4bf4163aad3c 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -35,7 +35,7 @@ #include "warnpassword.hxx" #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> #include <ucbhelper/simpleinteractionrequest.hxx> diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index a72e8c4373c0..cb54532384b5 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/table/XColumnRowRange.hpp> #include <ooo/vba/excel/XlColorIndex.hpp> #include <ooo/vba/excel/XlUnderlineStyle.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "vbafont.hxx" #include "scitems.hxx" #include "cellsuno.hxx" diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index e69de29bb2d1..e010d1cf10f3 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -0,0 +1,830 @@ +/************************************************************************* + * + * 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 + * + * $RCSfile: vbahelper.cxx,v $ + * $Revision: 1.5.32.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/util/XURLTransformer.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XDesktop.hpp> +#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XIntrospection.hpp> + +#include <comphelper/processfactory.hxx> + +#include <sfx2/objsh.hxx> +#include <sfx2/viewfrm.hxx> +#include <sfx2/dispatch.hxx> +#include <sfx2/app.hxx> +#include <svl/stritem.hxx> + +#include <docuno.hxx> + +#include <basic/sbx.hxx> +#include <basic/sbstar.hxx> +#include <rtl/math.hxx> + +#include <math.h> +#include "vbahelper.hxx" +#include "tabvwsh.hxx" +#include "transobj.hxx" +#include "scmod.hxx" +#include "vbashape.hxx" +#include "unonames.hxx" +#include "cellsuno.hxx" +using namespace ::com::sun::star; +using namespace ::ooo::vba; + +#define POINTTO100THMILLIMETERFACTOR 35.27778 +void unoToSbxValue( SbxVariable* pVar, const uno::Any& aValue ); + +uno::Any sbxToUnoValue( SbxVariable* pVar ); + + +namespace ooo +{ +namespace vba +{ + +const double Millimeter::factor = 35.27778; + +uno::Reference< beans::XIntrospectionAccess > +getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException) +{ + static uno::Reference< beans::XIntrospection > xIntrospection; + if( !xIntrospection.is() ) + { + uno::Reference< lang::XMultiServiceFactory > xFactory( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); + xIntrospection.set( xFactory->createInstance( rtl::OUString::createFromAscii("com.sun.star.beans.Introspection") ), uno::UNO_QUERY_THROW ); + } + return xIntrospection->inspect( aObject ); +} + +uno::Reference< script::XTypeConverter > +getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) +{ + static uno::Reference< script::XTypeConverter > xTypeConv( xContext->getServiceManager()->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter") ), xContext ), uno::UNO_QUERY_THROW ); + return xTypeConv; +} +// helper method to determine if the view ( calc ) is in print-preview mode +bool isInPrintPreview( SfxViewFrame* pView ) +{ + sal_uInt16 nViewNo = SID_VIEWSHELL1 - SID_VIEWSHELL0; + if ( pView->GetObjectShell()->GetFactory().GetViewFactoryCount() > +nViewNo && !pView->GetObjectShell()->IsInPlaceActive() ) + { + SfxViewFactory &rViewFactory = + pView->GetObjectShell()->GetFactory().GetViewFactory(nViewNo); + if ( pView->GetCurViewId() == rViewFactory.GetOrdinal() ) + return true; + } + return false; +} +const ::rtl::OUString REPLACE_CELLS_WARNING( RTL_CONSTASCII_USTRINGPARAM( "ReplaceCellsWarning")); +const uno::Any& +aNULL() +{ + static uno::Any aNULLL = uno::makeAny( uno::Reference< uno::XInterface >() ); + return aNULLL; +} + +class PasteCellsWarningReseter +{ +private: + bool bInitialWarningState; + static uno::Reference< beans::XPropertySet > getGlobalSheetSettings() throw ( uno::RuntimeException ) + { + static uno::Reference< beans::XPropertySet > xTmpProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); + static uno::Reference<uno::XComponentContext > xContext( xTmpProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + static uno::Reference<lang::XMultiComponentFactory > xServiceManager( + xContext->getServiceManager(), uno::UNO_QUERY_THROW ); + static uno::Reference< beans::XPropertySet > xProps( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.GlobalSheetSettings" ) ) ,xContext ), uno::UNO_QUERY_THROW ); + return xProps; + } + + bool getReplaceCellsWarning() throw ( uno::RuntimeException ) + { + sal_Bool res = sal_False; + getGlobalSheetSettings()->getPropertyValue( REPLACE_CELLS_WARNING ) >>= res; + return ( res == sal_True ); + } + + void setReplaceCellsWarning( bool bState ) throw ( uno::RuntimeException ) + { + getGlobalSheetSettings()->setPropertyValue( REPLACE_CELLS_WARNING, uno::makeAny( bState ) ); + } +public: + PasteCellsWarningReseter() throw ( uno::RuntimeException ) + { + bInitialWarningState = getReplaceCellsWarning(); + if ( bInitialWarningState ) + setReplaceCellsWarning( false ); + } + ~PasteCellsWarningReseter() + { + if ( bInitialWarningState ) + { + // don't allow dtor to throw + try + { + setReplaceCellsWarning( true ); + } + catch ( uno::Exception& /*e*/ ){} + } + } +}; + +void +dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl, uno::Sequence< beans::PropertyValue >& sProps ) +{ + + util::URL url ; + url.Complete = aUrl; + rtl::OUString emptyString = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "" )); + uno::Reference<frame::XController> xController = xModel->getCurrentController(); + uno::Reference<frame::XFrame> xFrame = xController->getFrame(); + uno::Reference<frame::XDispatchProvider> xDispatchProvider (xFrame,uno::UNO_QUERY_THROW); + try + { + uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); + uno::Reference<uno::XComponentContext > xContext( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + if ( !xContext.is() ) + { + return ; + } + + uno::Reference<lang::XMultiComponentFactory > xServiceManager( + xContext->getServiceManager() ); + if ( !xServiceManager.is() ) + { + return ; + } + uno::Reference<util::XURLTransformer> xParser( xServiceManager->createInstanceWithContext( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.URLTransformer" ) ) + ,xContext), uno::UNO_QUERY_THROW ); + if (!xParser.is()) + return; + xParser->parseStrict (url); + } + catch ( uno::Exception & /*e*/ ) + { + return ; + } + + uno::Reference<frame::XDispatch> xDispatcher = xDispatchProvider->queryDispatch(url,emptyString,0); + + uno::Sequence<beans::PropertyValue> dispatchProps(1); + + sal_Int32 nProps = sProps.getLength(); + beans::PropertyValue* pDest = dispatchProps.getArray(); + if ( nProps ) + { + dispatchProps.realloc( nProps + 1 ); + // need to reaccquire pDest after realloc + pDest = dispatchProps.getArray(); + beans::PropertyValue* pSrc = sProps.getArray(); + for ( sal_Int32 index=0; index<nProps; ++index, ++pSrc, ++pDest ) + *pDest = *pSrc; + } + + (*pDest).Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Silent" )); + (*pDest).Value <<= (sal_Bool)sal_True; + + if (xDispatcher.is()) + xDispatcher->dispatch( url, dispatchProps ); +} + +void +dispatchRequests (uno::Reference< frame::XModel>& xModel,rtl::OUString & aUrl) +{ + uno::Sequence<beans::PropertyValue> dispatchProps; + dispatchRequests( xModel, aUrl, dispatchProps ); +} + + +void dispatchExecute(css::uno::Reference< css::frame::XModel>& xModel, USHORT nSlot, SfxCallMode nCall) +{ + ScTabViewShell* pViewShell = getBestViewShell( xModel ); + SfxViewFrame* pViewFrame = NULL; + if ( pViewShell ) + pViewFrame = pViewShell->GetViewFrame(); + if ( pViewFrame ) + { + SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher(); + if( pDispatcher ) + { + pDispatcher->Execute( nSlot , nCall ); + } + } +} + +void +implnPaste() +{ + PasteCellsWarningReseter resetWarningBox; + ScTabViewShell* pViewShell = getCurrentBestViewShell(); + if ( pViewShell ) + { + pViewShell->PasteFromSystem(); + pViewShell->CellContentChanged(); + } +} + + +void +implnCopy() +{ + ScTabViewShell* pViewShell = getCurrentBestViewShell(); + if ( pViewShell ) + pViewShell->CopyToClip(NULL,false,false,true); +} + +void +implnCut() +{ + ScTabViewShell* pViewShell = getCurrentBestViewShell(); + if ( pViewShell ) + pViewShell->CutToClip( NULL, TRUE ); +} + +void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose) +{ + PasteCellsWarningReseter resetWarningBox; + sal_Bool bAsLink(sal_False), bOtherDoc(sal_False); + InsCellCmd eMoveMode = INS_NONE; + + ScTabViewShell* pTabViewShell = ScTabViewShell::GetActiveViewShell(); + if ( !pTabViewShell ) + // none active, try next best + pTabViewShell = getCurrentBestViewShell(); + if ( pTabViewShell ) + { + ScViewData* pView = pTabViewShell->GetViewData(); + Window* pWin = ( pView != NULL ) ? pView->GetActiveWin() : NULL; + if ( pView && pWin ) + { + if ( bAsLink && bOtherDoc ) + pTabViewShell->PasteFromSystem(0);//SOT_FORMATSTR_ID_LINK + else + { + ScTransferObj* pOwnClip = ScTransferObj::GetOwnClipboard( pWin ); + ScDocument* pDoc = NULL; + if ( pOwnClip ) + pDoc = pOwnClip->GetDocument(); + pTabViewShell->PasteFromClip( nFlags, pDoc, + nFunction, bSkipEmpty, bTranspose, bAsLink, + eMoveMode, IDF_NONE, TRUE ); + pTabViewShell->CellContentChanged(); + } + } + } + +} + + uno::Reference< frame::XModel > +getCurrentDocument() throw (uno::RuntimeException) +{ + uno::Reference< frame::XModel > xModel; + SbxObject* pBasic = dynamic_cast< SbxObject* > ( SFX_APP()->GetBasic() ); + SbxObject* basicChosen = pBasic ; + if ( basicChosen == NULL) + { + OSL_TRACE("getModelFromBasic() StarBASIC* is NULL" ); + return xModel; + } + SbxObject* p = pBasic; + SbxObject* pParent = p->GetParent(); + SbxObject* pParentParent = pParent ? pParent->GetParent() : NULL; + + if( pParentParent ) + { + basicChosen = pParentParent; + } + else if( pParent ) + { + basicChosen = pParent; + } + + + uno::Any aModel; + SbxVariable *pCompVar = basicChosen->Find( UniString(RTL_CONSTASCII_USTRINGPARAM("ThisComponent")), SbxCLASS_OBJECT ); + + if ( pCompVar ) + { + aModel = sbxToUnoValue( pCompVar ); + if ( sal_False == ( aModel >>= xModel ) || + !xModel.is() ) + { + // trying last gasp try the current component + uno::Reference< beans::XPropertySet > xProps( ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW ); + // test if vba service is present + uno::Reference< uno::XComponentContext > xCtx( xProps->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))), uno::UNO_QUERY_THROW ); + uno::Reference<lang::XMultiComponentFactory > xSMgr( xCtx->getServiceManager(), uno::UNO_QUERY_THROW ); + uno::Reference< frame::XDesktop > xDesktop (xSMgr->createInstanceWithContext(::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop"), xCtx), uno::UNO_QUERY_THROW ); + xModel.set( xDesktop->getCurrentComponent(), uno::UNO_QUERY ); + if ( !xModel.is() ) + { + throw uno::RuntimeException( + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Can't extract model from basic ( its obviously not set yet ) therefore don't know the currently selected document") ), uno::Reference< uno::XInterface >() ); + } + return xModel; + } + else + { + OSL_TRACE("Have model ThisComponent points to url %s", + ::rtl::OUStringToOString( xModel->getURL(), + RTL_TEXTENCODING_ASCII_US ).pData->buffer ); + } + } + else + { + OSL_TRACE("Failed to get ThisComponent"); + throw uno::RuntimeException( + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "Can't determine the currently selected document") ), + uno::Reference< uno::XInterface >() ); + } + return xModel; +} + +ScDocShell* +getDocShell( css::uno::Reference< css::frame::XModel>& xModel ) +{ + uno::Reference< uno::XInterface > xIf( xModel, uno::UNO_QUERY_THROW ); + ScModelObj* pModel = dynamic_cast< ScModelObj* >( xIf.get() ); + ScDocShell* pDocShell = NULL; + if ( pModel ) + pDocShell = (ScDocShell*)pModel->GetEmbeddedObject(); + return pDocShell; + +} + +ScTabViewShell* +getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) +{ + ScDocShell* pDocShell = getDocShell( xModel ); + if ( pDocShell ) + return pDocShell->GetBestViewShell(); + return NULL; +} + +ScTabViewShell* +getCurrentBestViewShell() +{ + uno::Reference< frame::XModel > xModel = getCurrentDocument(); + return getBestViewShell( xModel ); +} + +SfxViewFrame* +getCurrentViewFrame() +{ + ScTabViewShell* pViewShell = getCurrentBestViewShell(); + if ( pViewShell ) + return pViewShell->GetViewFrame(); + return NULL; +} + +sal_Int32 +OORGBToXLRGB( sal_Int32 nCol ) +{ + sal_Int32 nRed = nCol; + nRed &= 0x00FF0000; + nRed >>= 16; + sal_Int32 nGreen = nCol; + nGreen &= 0x0000FF00; + nGreen >>= 8; + sal_Int32 nBlue = nCol; + nBlue &= 0x000000FF; + sal_Int32 nRGB = ( (nBlue << 16) | (nGreen << 8) | nRed ); + return nRGB; +} +sal_Int32 +XLRGBToOORGB( sal_Int32 nCol ) +{ + sal_Int32 nBlue = nCol; + nBlue &= 0x00FF0000; + nBlue >>= 16; + sal_Int32 nGreen = nCol; + nGreen &= 0x0000FF00; + nGreen >>= 8; + sal_Int32 nRed = nCol; + nRed &= 0x000000FF; + sal_Int32 nRGB = ( (nRed << 16) | (nGreen << 8) | nBlue ); + return nRGB; +} +uno::Any +OORGBToXLRGB( const uno::Any& aCol ) +{ + sal_Int32 nCol=0; + aCol >>= nCol; + nCol = OORGBToXLRGB( nCol ); + return uno::makeAny( nCol ); +} +uno::Any +XLRGBToOORGB( const uno::Any& aCol ) +{ + sal_Int32 nCol=0; + aCol >>= nCol; + nCol = XLRGBToOORGB( nCol ); + return uno::makeAny( nCol ); +} + +void PrintOutHelper( const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, css::uno::Reference< frame::XModel >& xModel, sal_Bool bUseSelection ) +{ + sal_Int32 nTo = 0; + sal_Int32 nFrom = 0; + sal_Int16 nCopies = 1; + sal_Bool bPreview = sal_False; + sal_Bool bCollate = sal_False; + sal_Bool bSelection = bUseSelection; + From >>= nFrom; + To >>= nTo; + Copies >>= nCopies; + Preview >>= bPreview; + if ( nCopies > 1 ) // Collate only useful when more that 1 copy + Collate >>= bCollate; + + rtl::OUString sRange( RTL_CONSTASCII_USTRINGPARAM( "-" ) ); + rtl::OUString sFileName; + + if (( nFrom || nTo ) ) + { + if ( nFrom ) + sRange = ( ::rtl::OUString::valueOf( nFrom ) + sRange ); + if ( nTo ) + sRange += ::rtl::OUString::valueOf( nTo ); + } + + if ( PrToFileName.getValue() ) + { + PrToFileName >>= sFileName; + } + ScTabViewShell* pViewShell = getBestViewShell( xModel ); + SfxViewFrame* pViewFrame = NULL; + if ( pViewShell ) + pViewFrame = pViewShell->GetViewFrame(); + if ( pViewFrame ) + { + SfxAllItemSet aArgs( SFX_APP()->GetPool() ); + + SfxBoolItem sfxCollate( SID_PRINT_COLLATE, bCollate ); + aArgs.Put( sfxCollate, sfxCollate.Which() ); + SfxInt16Item sfxCopies( SID_PRINT_COPIES, nCopies ); + aArgs.Put( sfxCopies, sfxCopies.Which() ); + if ( sFileName.getLength() ) + { + SfxStringItem sfxFileName( SID_FILE_NAME, sFileName); + aArgs.Put( sfxFileName, sfxFileName.Which() ); + + } + if ( sRange.getLength() ) + { + SfxStringItem sfxRange( SID_PRINT_PAGES, sRange ); + aArgs.Put( sfxRange, sfxRange.Which() ); + } + SfxBoolItem sfxSelection( SID_SELECTION, bSelection ); + aArgs.Put( sfxSelection, sfxSelection.Which() ); + SfxBoolItem sfxAsync( SID_ASYNCHRON, sal_False ); + aArgs.Put( sfxAsync, sfxAsync.Which() ); + SfxDispatcher* pDispatcher = pViewFrame->GetDispatcher(); + + if ( pDispatcher ) + { + if ( bPreview ) + { + if ( !pViewFrame->GetFrame()->IsInPlace() ) + { + SC_MOD()->InputEnterHandler(); + pViewFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_SYNCHRON ); + while ( isInPrintPreview( pViewFrame ) ) + Application::Yield(); + } + } + else + pDispatcher->Execute( (USHORT)SID_PRINTDOC, (SfxCallMode)SFX_CALLMODE_SYNCHRON, aArgs ); + } + + } + + // #FIXME #TODO + // 1 ActivePrinter ( how/can we switch a printer via API? ) + // 2 PrintToFile ( ms behaviour if this option is specified but no + // filename supplied 'PrToFileName' then the user will be prompted ) + // 3 Need to check behaviour of Selected sheets with range ( e.g. From & To + // values ) in oOO these options are mutually exclusive + // 4 There is a pop up to do with transparent objects in the print source + // should be able to disable that via configuration for the duration + // of this method +} + + void PrintPreviewHelper( const css::uno::Any& /*EnableChanges*/, css::uno::Reference< css::frame::XModel >& xModel ) +{ + dispatchExecute( xModel, SID_VIEWSHELL1 ); +} + +rtl::OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeException ) +{ + uno::Type aType = pvargItem.getValueType(); + uno::TypeClass eTypeClass = aType.getTypeClass(); + rtl::OUString sString; + switch ( eTypeClass ) + { + case uno::TypeClass_BOOLEAN: + { + sal_Bool bBool = sal_False; + pvargItem >>= bBool; + sString = rtl::OUString::valueOf( bBool ); + break; + } + case uno::TypeClass_STRING: + pvargItem >>= sString; + break; + case uno::TypeClass_FLOAT: + { + float aFloat = 0; + pvargItem >>= aFloat; + sString = rtl::OUString::valueOf( aFloat ); + break; + } + case uno::TypeClass_DOUBLE: + { + double aDouble = 0; + pvargItem >>= aDouble; + sString = rtl::OUString::valueOf( aDouble ); + break; + } + case uno::TypeClass_SHORT: + case uno::TypeClass_LONG: + case uno::TypeClass_BYTE: + { + sal_Int32 aNum = 0; + pvargItem >>= aNum; + sString = rtl::OUString::valueOf( aNum ); + break; + } + + case uno::TypeClass_HYPER: + { + sal_Int64 aHyper = 0; + pvargItem >>= aHyper; + sString = rtl::OUString::valueOf( aHyper ); + break; + } + default: + throw uno::RuntimeException( rtl::OUString::createFromAscii( "Invalid type, can't convert" ), uno::Reference< uno::XInterface >() ); + } + return sString; +} + + +rtl::OUString +ContainerUtilities::getUniqueName( const uno::Sequence< ::rtl::OUString >& _slist, const rtl::OUString& _sElementName, const ::rtl::OUString& _sSuffixSeparator) +{ + return getUniqueName(_slist, _sElementName, _sSuffixSeparator, sal_Int32(2)); +} + +rtl::OUString +ContainerUtilities::getUniqueName( const uno::Sequence< rtl::OUString >& _slist, const rtl::OUString _sElementName, const rtl::OUString& _sSuffixSeparator, sal_Int32 _nStartSuffix) +{ + sal_Int32 a = _nStartSuffix; + rtl::OUString scompname = _sElementName; + bool bElementexists = true; + sal_Int32 nLen = _slist.getLength(); + if ( nLen == 0 ) + return _sElementName; + + while (bElementexists == true) + { + for (sal_Int32 i = 0; i < nLen; i++) + { + if (FieldInList(_slist, scompname) == -1) + { + return scompname; + } + } + scompname = _sElementName + _sSuffixSeparator + rtl::OUString::valueOf( a++ ); + } + return rtl::OUString(); +} + +sal_Int32 +ContainerUtilities::FieldInList( const uno::Sequence< rtl::OUString >& SearchList, const rtl::OUString& SearchString ) +{ + sal_Int32 FieldLen = SearchList.getLength(); + sal_Int32 retvalue = -1; + for (sal_Int32 i = 0; i < FieldLen; i++) + { + // I wonder why comparing lexicographically is done + // when its a match is whats interesting? + //if (SearchList[i].compareTo(SearchString) == 0) + if ( SearchList[i].equals( SearchString ) ) + { + retvalue = i; + break; + } + } + return retvalue; + +} +bool NeedEsc(sal_Unicode cCode) +{ + String sEsc(RTL_CONSTASCII_USTRINGPARAM(".^$+\\|{}()")); + return (STRING_NOTFOUND != sEsc.Search(cCode)); +} + +rtl::OUString VBAToRegexp(const rtl::OUString &rIn, bool bForLike ) +{ + rtl::OUStringBuffer sResult; + const sal_Unicode *start = rIn.getStr(); + const sal_Unicode *end = start + rIn.getLength(); + + int seenright = 0; + if ( bForLike ) + sResult.append(static_cast<sal_Unicode>('^')); + + while (start < end) + { + switch (*start) + { + case '?': + sResult.append(static_cast<sal_Unicode>('.')); + start++; + break; + case '*': + sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".*"))); + start++; + break; + case '#': + sResult.append(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[0-9]"))); + start++; + break; + case '~': + sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append(*(++start)); + start++; + break; + // dump the ~ and escape the next characture + case ']': + sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append(*start++); + break; + case '[': + sResult.append(*start++); + seenright = 0; + while (start < end && !seenright) + { + switch (*start) + { + case '[': + case '?': + case '*': + sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append(*start); + break; + case ']': + sResult.append(*start); + seenright = 1; + break; + case '!': + sResult.append(static_cast<sal_Unicode>('^')); + break; + default: + if (NeedEsc(*start)) + sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append(*start); + break; + } + start++; + } + break; + default: + if (NeedEsc(*start)) + sResult.append(static_cast<sal_Unicode>('\\')); + sResult.append(*start++); + } + } + + if ( bForLike ) + sResult.append(static_cast<sal_Unicode>('$')); + + return sResult.makeStringAndClear( ); +} + +double getPixelTo100thMillimeterConversionFactor( css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical) +{ + double fConvertFactor = 1.0; + if( bVertical ) + { + fConvertFactor = xDevice->getInfo().PixelPerMeterY/100000; + } + else + { + fConvertFactor = xDevice->getInfo().PixelPerMeterX/100000; + } + return fConvertFactor; +} + +double PointsToPixels( css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical) +{ + double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical ); + return fPoints * POINTTO100THMILLIMETERFACTOR * fConvertFactor; +} +double PixelsToPoints( css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical) +{ + double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical ); + return (fPixels/fConvertFactor)/POINTTO100THMILLIMETERFACTOR; +} + +ConcreteXShapeGeometryAttributes::ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ) +{ + m_xShape = new ScVbaShape( xContext, xShape ); +} + +#define VBA_LEFT "PositionX" +#define VBA_TOP "PositionY" +UserFormGeometryHelper::UserFormGeometryHelper( const uno::Reference< uno::XComponentContext >& /*xContext*/, const uno::Reference< awt::XControl >& xControl ) +{ + mxModel.set( xControl->getModel(), uno::UNO_QUERY_THROW ); +} + double UserFormGeometryHelper::getLeft() + { + sal_Int32 nLeft = 0; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ) ) >>= nLeft; + return Millimeter::getInPoints( nLeft ); + } + void UserFormGeometryHelper::setLeft( double nLeft ) + { + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_LEFT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nLeft ) ) ); + } + double UserFormGeometryHelper::getTop() + { + sal_Int32 nTop = 0; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ) ) >>= nTop; + return Millimeter::getInPoints( nTop ); + } + void UserFormGeometryHelper::setTop( double nTop ) + { + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VBA_TOP ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nTop ) ) ); + } + double UserFormGeometryHelper::getHeight() + { + sal_Int32 nHeight = 0; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ) ) >>= nHeight; + return Millimeter::getInPoints( nHeight ); + } + void UserFormGeometryHelper::setHeight( double nHeight ) + { + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLHGT ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nHeight ) ) ); + } + double UserFormGeometryHelper::getWidth() + { + sal_Int32 nWidth = 0; + mxModel->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ) ) >>= nWidth; + return Millimeter::getInPoints( nWidth ); + } + void UserFormGeometryHelper::setWidth( double nWidth) + { + mxModel->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_CELLWID ) ), uno::makeAny( Millimeter::getInHundredthsOfOneMillimeter( nWidth ) ) ); + } + +SfxItemSet* +ScVbaCellRangeAccess::GetDataSet( ScCellRangeObj* pRangeObj ) +{ + SfxItemSet* pDataSet = pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : NULL ; + return pDataSet; + +} + +} // openoffice +} //org +======= +>>>>>>> other diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 4f0607e430f6..dca004a74e65 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -35,8 +35,8 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/itemwrapper.hxx> -#include <svtools/itemset.hxx> -#include <svtools/eitem.hxx> +#include <svl/itemset.hxx> +#include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase3.hxx> diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index c2d0f68fc6ef..e9116b19c87b 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -35,10 +35,10 @@ #include "scitems.hxx" -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> +#include <unotools/moduleoptions.hxx> #include <svtools/cliplistener.hxx> #include <svtools/insdlg.hxx> #include <sot/formats.hxx> diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index f610e28b3fc5..6bdf172b9fb5 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -55,10 +55,10 @@ #include <sfx2/viewfrm.hxx> #define _ZFORLIST_DECLARE_TABLE -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <vcl/msgbox.hxx> @@ -70,7 +70,7 @@ #include <sfx2/passwd.hxx> #include <svx/hlnkitem.hxx> #include <basic/sbxcore.hxx> -#include <svtools/useroptions.hxx> +#include <unotools/useroptions.hxx> #include <vcl/waitobj.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 29db7f2286b3..cf64a07a2d95 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -41,14 +41,14 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/app.hxx> #include <sfx2/request.hxx> -#include <svtools/aeitem.hxx> +#include <svl/aeitem.hxx> #include <basic/sbxcore.hxx> -#include <svtools/whiter.hxx> -#include <svtools/zforlist.hxx> +#include <svl/whiter.hxx> +#include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> -#include <svtools/stritem.hxx> -#include <svtools/visitem.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/visitem.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index dd79bb52a112..2f96aec815fb 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -40,7 +40,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/msgbox.hxx> #include <sfx2/app.hxx> #include "globstr.hrc" diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 36667ee43c0f..5fd4a5f470f5 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -42,7 +42,7 @@ #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/waitobj.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <sfx2/app.hxx> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> #include <com/sun/star/sheet/DataPilotFieldSortMode.hpp> diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 022eabdc11cf..b0f2197ad826 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -64,12 +64,12 @@ #include <sfx2/viewfrm.hxx> #include <sot/exchange.hxx> #include <svtools/cliplistener.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <sot/formats.hxx> #include <svtools/transfer.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #define _EDITSH_CXX #include "editsh.hxx" diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 36f6c682832f..fb83ed5624d6 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -60,13 +60,13 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #define _ZFORLIST_DECLARE_TABLE -#include <svtools/stritem.hxx> -#include <svtools/zformat.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/zformat.hxx> +#include <svl/languageoptions.hxx> #include <svx/boxitem.hxx> #include <svx/langitem.hxx> #include <svx/numinf.hxx> diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index de2b962f3272..aca88c554317 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -45,10 +45,10 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/docfile.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/svlbox.hxx> #include <svtools/svtabbx.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <tools/urlobj.hxx> #include <vcl/cursor.hxx> #include <vcl/sound.hxx> diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 5d87806076ab..6683a75e777b 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/sizeitem.hxx> #include <sfx2/bindings.hxx> -#include <svtools/ptitem.hxx> +#include <svl/ptitem.hxx> #include "tabvwsh.hxx" #include "gridwin.hxx" diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 2c50a8eb0a81..419124596147 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -36,8 +36,8 @@ #include <svx/svdpage.hxx> #include <svx/svdocapt.hxx> #include <sfx2/printer.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/itempool.hxx> +#include <unotools/pathoptions.hxx> +#include <svl/itempool.hxx> #include <vcl/svapp.hxx> #include "notemark.hxx" diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index f5688171b145..700c32e4698f 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -55,7 +55,7 @@ #include <svx/scripttypeitem.hxx> #include <svx/udlnitem.hxx> #include <svx/unolingu.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <vcl/svapp.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> @@ -63,7 +63,7 @@ #ifndef _SVSTDARR_USHORTS #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #endif #include "output.hxx" diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 421e76eaa8ce..3ab72f37ac35 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -41,7 +41,7 @@ #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include "pgbrksh.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index 273b8965451e..2039934a6e45 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -41,7 +41,7 @@ #include <sfx2/objface.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "sc.hrc" diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index b94837fc1793..31121f35aa1b 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -47,7 +47,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> #include <svtools/accessibilityoptions.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <tools/multisel.hxx> #include <vcl/waitobj.hxx> #include <vcl/sound.hxx> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 360c05e2f84a..ebe58f5a0efc 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -49,8 +49,8 @@ #include <sfx2/request.hxx> #include <sfx2/topfrm.hxx> #include <svtools/printdlg.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include <vcl/help.hxx> #include <tools/urlobj.hxx> @@ -705,7 +705,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractSvxZoomDialog* pDlg = pFact->CreateSvxZoomDialog(NULL, aSet, RID_SVXDLG_ZOOM); + AbstractSvxZoomDialog* pDlg = pFact->CreateSvxZoomDialog(NULL, aSet); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 pDlg->SetLimits( 20, 400 ); pDlg->HideButton( ZOOMBTN_OPTIMAL ); diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 157f4bffa4ec..58dc2d913c58 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -300,7 +300,7 @@ // INCLUDE --------------------------------------------------------------- #include <svx/svdmodel.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include "prevwsh.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index db6ee302a792..08b7f5f4ad85 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -41,10 +41,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/aeitem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/aeitem.hxx> +#include <svl/whiter.hxx> +#include <unotools/moduleoptions.hxx> +#include <svl/languageoptions.hxx> #include <sfx2/dispatch.hxx> #include "tabvwsh.hxx" @@ -67,7 +67,7 @@ // #98185# Create default drawing objects via keyboard #include <svx/svdpagv.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/svdpage.hxx> #include <fuconcustomshape.hxx> diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 525ea1f14578..c2812fdc4446 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -45,8 +45,8 @@ #include <sfx2/passwd.hxx> #include <sfx2/request.hxx> #include <sfx2/topfrm.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/stritem.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -78,9 +78,9 @@ #include "tabprotection.hxx" #include "protectiondlg.hxx" -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <svx/zoomslideritem.hxx> #include <svx/svxdlg.hxx> //CHINA001 @@ -693,7 +693,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxZoomDialog(GetDialogParent(), aSet, RID_SVXDLG_ZOOM); + pDlg = pFact->CreateSvxZoomDialog(GetDialogParent(), aSet ); DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 } pDlg->SetLimits( MINZOOM, MAXZOOM ); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index e34741ba4c6b..359c34ec3685 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -51,8 +51,8 @@ #include <sfx2/printer.hxx> #include <sfx2/dispatch.hxx> #include <svtools/printdlg.hxx> -#include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/whiter.hxx> +#include <unotools/moduleoptions.hxx> #include <rtl/logfile.hxx> #include <tools/urlobj.hxx> #include <sfx2/docfile.hxx> diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 92cf03cdf5d6..a870171450ad 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -36,8 +36,8 @@ // INCLUDE --------------------------------------------------------------- #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx" -#include <svtools/smplhint.hxx> -#include <svtools/zforlist.hxx> +#include <svl/smplhint.hxx> +#include <svl/zforlist.hxx> #include <svx/numfmtsh.hxx> #include <svx/numinf.hxx> #include <svx/svxids.hrc> diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 7562e7d592a0..d3020756bbb5 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -44,7 +44,7 @@ #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <avmedia/mediaplayer.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index 9e844f970909..63f876cccf34 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -37,10 +37,10 @@ #define _ZFORLIST_DECLARE_TABLE #include "scitems.hxx" -#include <svtools/slstitm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/zformat.hxx> +#include <svl/slstitm.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> +#include <svl/zformat.hxx> #include <svx/boxitem.hxx> #include <svx/numinf.hxx> #include <svx/srchitem.hxx> diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 37dc2c11da7f..72ffe6d5ab10 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -63,9 +63,9 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svtools/soerr.hxx> -#include <svtools/rectitem.hxx> -#include <svtools/whiter.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/rectitem.hxx> +#include <svl/whiter.hxx> +#include <unotools/moduleoptions.hxx> #include <sot/exchange.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 8eafd476d00d..9866a5aa0a0a 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -45,7 +45,7 @@ #include <sfx2/viewfrm.hxx> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <vcl/sound.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 744481c4441c..4ef21a24e1ff 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -39,9 +39,9 @@ #include <sfx2/request.hxx> #include <basic/sbstar.hxx> #include <layout/layout.hxx> -#include <svtools/languageoptions.hxx> -#include <svtools/stritem.hxx> -#include <svtools/whiter.hxx> +#include <svl/languageoptions.hxx> +#include <svl/stritem.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 7526a3de19bd..2d3ffc75340b 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -42,7 +42,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> #include <basic/sbxcore.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <vcl/msgbox.hxx> #include "tabvwsh.hxx" diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 50ede74ab06b..4c1bcc9e35fe 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -50,9 +50,9 @@ #include <sfx2/docfile.hxx> #include <sfx2/objitem.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/stritem.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/svstdarr.hxx> +#include <svl/stritem.hxx> +#include <svl/zforlist.hxx> +#include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/waitobj.hxx> diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 3065aa2fd4e1..3327ea3fe88d 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -173,9 +173,9 @@ #include <svx/svdetc.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> -#include <svtools/stritem.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/stritem.hxx> +#include <svl/ptitem.hxx> +#include <svl/urlbmk.hxx> #include <sot/clsids.hxx> #include <sot/formats.hxx> #include <vcl/graph.hxx> diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 578f6c1fe733..b57653af5f9b 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -54,9 +54,9 @@ #include <sfx2/fcontnr.hxx> #include <svtools/langtab.hxx> #include <svtools/filter.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svtools/transfer.hxx> -#include <svtools/urlbmk.hxx> +#include <svl/urlbmk.hxx> #include <vcl/msgbox.hxx> #include <avmedia/mediawindow.hxx> diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 35af3ee2a2e3..0b429a21b6d3 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -53,9 +53,9 @@ #include <sot/clsids.hxx> #include <sot/formats.hxx> #include <sot/filelist.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/ptitem.hxx> -#include <svtools/stritem.hxx> +#include <unotools/pathoptions.hxx> +#include <svl/ptitem.hxx> +#include <svl/stritem.hxx> #include <svtools/transfer.hxx> #include <vcl/graph.hxx> diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 79343c31f85b..a3e695e7a3f8 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -48,8 +48,8 @@ #include <svx/langitem.hxx> #include <svx/scripttypeitem.hxx> #include <sfx2/bindings.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <vcl/msgbox.hxx> #include <vcl/sound.hxx> #include <vcl/virdev.hxx> diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index d0a6f2acf015..cc51c48f67ed 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -43,17 +43,17 @@ #include <svx/fontitem.hxx> #include <svx/langitem.hxx> #include <svx/scripttypeitem.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <vcl/wrkwin.hxx> #include <sfx2/request.hxx> #include <sfx2/objsh.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> |