From e3aa4b58f6221e65564941688db6a38182ff92c8 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Mon, 13 Jul 2009 11:08:01 +0000 Subject: #i1601# sentence case transliteration --- sd/sdi/_drvwsh.sdi | 5 +++++ sd/sdi/outlnvsh.sdi | 5 +++++ sd/source/ui/view/drviewse.cxx | 8 +++++++- sd/source/ui/view/drviewsf.cxx | 1 + sd/source/ui/view/outlnvsh.cxx | 10 ++++++++-- sd/uiconfig/sdraw/menubar/menubar.xml | 1 + sd/uiconfig/simpress/menubar/menubar.xml | 1 + 7 files changed, 28 insertions(+), 3 deletions(-) (limited to 'sd') diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 8f758dda5858..eb4d5a63985d 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2181,6 +2181,11 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] + SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 3b0c49af6901..61be9eae3606 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -446,6 +446,11 @@ interface OutlineView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] + SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? + [ + ExecMethod = FuSupport ; + StateMethod = GetCtrlState ; + ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 0b3ecf1af6e7..725a7fb4ad27 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -34,7 +34,9 @@ #include #include #include -#include +#include +#include + #include @@ -1388,6 +1390,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: + case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -1407,6 +1410,9 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; + case SID_TRANSLITERATE_SENTENCE_CASE: + nType = TransliterationModulesExtra::SENTENCE_CASE; + break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 2b1b7518666c..47c487d8df93 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -256,6 +256,7 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) rSet.DisableItem( SID_TRANSLITERATE_UPPER ); rSet.DisableItem( SID_TRANSLITERATE_LOWER ); + rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index d629eef58fc6..cdbf218417d9 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,7 +63,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -538,6 +539,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( pOlView && ( (nSlot == SID_TRANSLITERATE_UPPER) || (nSlot == SID_TRANSLITERATE_LOWER) || + (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) || (nSlot == SID_TRANSLITERATE_HALFWIDTH) || (nSlot == SID_TRANSLITERATE_FULLWIDTH) || (nSlot == SID_TRANSLITERATE_HIRAGANA) || @@ -671,6 +673,7 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: + case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -690,6 +693,9 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; + case SID_TRANSLITERATE_SENTENCE_CASE: + nType = TransliterationModulesExtra::SENTENCE_CASE; + break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; @@ -996,7 +1002,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) GetDoc()->SetChanged(TRUE); } - // Da šberladen, muss hier der Status gesetzt werden + // Da �berladen, muss hier der Status gesetzt werden if( !GetDocSh()->IsModified() ) { rSet.DisableItem( SID_SAVEDOC ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index e34baec0f29c..d9574ec48707 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -185,6 +185,7 @@ + diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index ece53ad4c918..578bd89afacb 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -203,6 +203,7 @@ + -- cgit From c4137a7db5360997c2dd699755fcfc31fddf7543 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Mon, 13 Jul 2009 12:48:12 +0000 Subject: undoing r273933 which was accidently commited on master m51 --- sd/sdi/_drvwsh.sdi | 5 ----- sd/sdi/outlnvsh.sdi | 5 ----- sd/source/ui/view/drviewse.cxx | 8 +------- sd/source/ui/view/drviewsf.cxx | 1 - sd/source/ui/view/outlnvsh.cxx | 10 ++-------- sd/uiconfig/sdraw/menubar/menubar.xml | 1 - sd/uiconfig/simpress/menubar/menubar.xml | 1 - 7 files changed, 3 insertions(+), 28 deletions(-) (limited to 'sd') diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index eb4d5a63985d..8f758dda5858 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2181,11 +2181,6 @@ interface DrawView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] - SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? - [ - ExecMethod = FuSupport ; - StateMethod = GetCtrlState ; - ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index 61be9eae3606..3b0c49af6901 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -446,11 +446,6 @@ interface OutlineView ExecMethod = FuSupport ; StateMethod = GetCtrlState ; ] - SID_TRANSLITERATE_SENTENCE_CASE // ole : no, status : ? - [ - ExecMethod = FuSupport ; - StateMethod = GetCtrlState ; - ] SID_TRANSLITERATE_HALFWIDTH // ole : no, status : ? [ ExecMethod = FuSupport ; diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 725a7fb4ad27..0b3ecf1af6e7 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -34,9 +34,7 @@ #include #include #include -#include -#include - +#include #include @@ -1390,7 +1388,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: - case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -1410,9 +1407,6 @@ void DrawViewShell::FuSupport(SfxRequest& rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; - case SID_TRANSLITERATE_SENTENCE_CASE: - nType = TransliterationModulesExtra::SENTENCE_CASE; - break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 47c487d8df93..2b1b7518666c 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -256,7 +256,6 @@ void DrawViewShell::GetCtrlState(SfxItemSet &rSet) rSet.DisableItem( SID_TRANSLITERATE_UPPER ); rSet.DisableItem( SID_TRANSLITERATE_LOWER ); - rSet.DisableItem( SID_TRANSLITERATE_SENTENCE_CASE ); rSet.DisableItem( SID_TRANSLITERATE_HALFWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_FULLWIDTH ); rSet.DisableItem( SID_TRANSLITERATE_HIRAGANA ); diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index cdbf218417d9..d629eef58fc6 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -63,8 +63,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -539,7 +538,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) if( pOlView && ( (nSlot == SID_TRANSLITERATE_UPPER) || (nSlot == SID_TRANSLITERATE_LOWER) || - (nSlot == SID_TRANSLITERATE_SENTENCE_CASE) || (nSlot == SID_TRANSLITERATE_HALFWIDTH) || (nSlot == SID_TRANSLITERATE_FULLWIDTH) || (nSlot == SID_TRANSLITERATE_HIRAGANA) || @@ -673,7 +671,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_UPPER: case SID_TRANSLITERATE_LOWER: - case SID_TRANSLITERATE_SENTENCE_CASE: case SID_TRANSLITERATE_HALFWIDTH: case SID_TRANSLITERATE_FULLWIDTH: case SID_TRANSLITERATE_HIRAGANA: @@ -693,9 +690,6 @@ void OutlineViewShell::FuSupport(SfxRequest &rReq) case SID_TRANSLITERATE_LOWER: nType = TransliterationModules_UPPERCASE_LOWERCASE; break; - case SID_TRANSLITERATE_SENTENCE_CASE: - nType = TransliterationModulesExtra::SENTENCE_CASE; - break; case SID_TRANSLITERATE_HALFWIDTH: nType = TransliterationModules_FULLWIDTH_HALFWIDTH; break; @@ -1002,7 +996,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) GetDoc()->SetChanged(TRUE); } - // Da �berladen, muss hier der Status gesetzt werden + // Da šberladen, muss hier der Status gesetzt werden if( !GetDocSh()->IsModified() ) { rSet.DisableItem( SID_SAVEDOC ); diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index d9574ec48707..e34baec0f29c 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -185,7 +185,6 @@ - diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 578bd89afacb..ece53ad4c918 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -203,7 +203,6 @@ - -- cgit From 5800b0e7a1898f88fd675baf5f1e86b8a3b268ad Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Jul 2009 09:37:08 +0200 Subject: more dependencies fixed --- sd/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst index 40e6ed16ebee..5b0308d15b7c 100644 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,4 +1,4 @@ -sd sd : l10n animations svx stoc uui canvas NULL +sd sd : l10n animations svx stoc canvas NULL sd sd usr1 - all sd_mkout NULL sd sd\inc nmake - all sd_inc NULL sd sd\prj get - all sd_prj NULL -- cgit From b653cd4479611658c45e70af135eb31c97a1605e Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 15 Sep 2009 16:06:13 +0200 Subject: #i97509# seperated base and buffered classes for 2D and 3D, adapted aqll usages --- .../view/SlsPageObjectViewObjectContact.cxx | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 92a0abb72762..9cf09d6451a3 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -256,7 +256,7 @@ namespace sd { namespace slidesorter { namespace view { // class for all derived SdPageObjectPrimitives. The SdPageObjectBasePrimitive itself // is pure virtual -class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BasePrimitive2D +class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D { private: // the inner range of the SdPageObject visualisation @@ -271,11 +271,11 @@ public: const basegfx::B2DRange& getPageObjectRange() const { return maRange; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) -: drawinglayer::primitive2d::BasePrimitive2D(), +: drawinglayer::primitive2d::BufDecPrimitive2D(), maRange(rRange) { } @@ -284,9 +284,9 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive() { } -bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) { const SdPageObjectBasePrimitive& rCompare = static_cast< const SdPageObjectBasePrimitive& >(rPrimitive); return (getPageObjectRange() == rCompare.getPageObjectRange()); @@ -306,7 +306,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -319,13 +319,13 @@ public: const BitmapEx& getBitmapEx() const { return maBitmapEx; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // add bitmap primitive // to avoid scaling, use the Bitmap pixel size as primitive size @@ -358,7 +358,7 @@ SdPageObjectPageBitmapPrimitive::~SdPageObjectPageBitmapPrimitive() { } -bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -385,7 +385,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -399,7 +399,7 @@ public: const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorOffset(1); const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorThickness(3); -Primitive2DSequence SdPageObjectSelectPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectSelectPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -470,7 +470,7 @@ class SdPageObjectBorderPrimitive : public SdPageObjectBasePrimitive { protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -481,7 +481,7 @@ public: DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectBorderPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectBorderPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // since old Width/Height calculations always added a single pixel value, // it is necessary to create a inner range which is one display unit less @@ -523,7 +523,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -536,7 +536,7 @@ public: const sal_Int32 SdPageObjectFocusPrimitive::mnFocusIndicatorOffset(2); -Primitive2DSequence SdPageObjectFocusPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFocusPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -618,7 +618,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -641,7 +641,7 @@ public: bool getExcluded() const { return mbExcluded; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -666,7 +666,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c return *mpFadeEffectIconBitmap; } -Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocalDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { const xub_StrLen nTextLength(getPageName().Len()); const sal_uInt32 nCount( @@ -866,7 +866,7 @@ SdPageObjectFadeNameNumberPrimitive::~SdPageObjectFadeNameNumberPrimitive() { } -bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -1150,7 +1150,7 @@ void PageObjectViewObjectContact::ActionChanged (void) // Very simple primitive which just remembers the discrete data and applies // it at decomposition time. -class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BasePrimitive2D +class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D { private: basegfx::B2DRange maLogicRange; @@ -1159,7 +1159,7 @@ private: basegfx::BColor maRGBColor; protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createLocalDecomposition( + virtual drawinglayer::primitive2d::Primitive2DSequence createLocal2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: @@ -1168,7 +1168,7 @@ public: sal_uInt32 nDiscreteOffset, sal_uInt32 nDiscreteWidth, const basegfx::BColor& rRGBColor) - : drawinglayer::primitive2d::BasePrimitive2D(), + : drawinglayer::primitive2d::BufDecPrimitive2D(), maLogicRange(rLogicRange), mnDiscreteOffset(nDiscreteOffset), mnDiscreteWidth(nDiscreteWidth), @@ -1181,12 +1181,12 @@ public: sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; } const basegfx::BColor& getRGBColor() const { return maRGBColor; } - virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; DeclPrimitrive2DIDBlock() }; -drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocalDecomposition( +drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocal2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // get logic sizes in object coordinate system @@ -1214,9 +1214,9 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } -bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const +bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BasePrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) { const MouseOverEffectPrimitive& rCompare = static_cast< const MouseOverEffectPrimitive& >(rPrimitive); -- cgit From 9c198f356d0a55e96fe4f96384afcdd7d3a8cb87 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 15 Sep 2009 19:08:28 +0200 Subject: #i97509# changed base classes for primitives which need no buffering --- .../view/SlsPageObjectViewObjectContact.cxx | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 9cf09d6451a3..7908b4730eac 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -256,7 +256,7 @@ namespace sd { namespace slidesorter { namespace view { // class for all derived SdPageObjectPrimitives. The SdPageObjectBasePrimitive itself // is pure virtual -class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D +class SdPageObjectBasePrimitive : public drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: // the inner range of the SdPageObject visualisation @@ -271,11 +271,11 @@ public: const basegfx::B2DRange& getPageObjectRange() const { return maRange; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) -: drawinglayer::primitive2d::BufDecPrimitive2D(), +: drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), maRange(rRange) { } @@ -284,9 +284,9 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive() { } -bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const SdPageObjectBasePrimitive& rCompare = static_cast< const SdPageObjectBasePrimitive& >(rPrimitive); return (getPageObjectRange() == rCompare.getPageObjectRange()); @@ -319,7 +319,7 @@ public: const BitmapEx& getBitmapEx() const { return maBitmapEx; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -358,7 +358,7 @@ SdPageObjectPageBitmapPrimitive::~SdPageObjectPageBitmapPrimitive() { } -bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -641,7 +641,7 @@ public: bool getExcluded() const { return mbExcluded; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -866,7 +866,7 @@ SdPageObjectFadeNameNumberPrimitive::~SdPageObjectFadeNameNumberPrimitive() { } -bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -1150,7 +1150,7 @@ void PageObjectViewObjectContact::ActionChanged (void) // Very simple primitive which just remembers the discrete data and applies // it at decomposition time. -class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufDecPrimitive2D +class MouseOverEffectPrimitive : public drawinglayer::primitive2d::BufferedDecompositionPrimitive2D { private: basegfx::B2DRange maLogicRange; @@ -1168,7 +1168,7 @@ public: sal_uInt32 nDiscreteOffset, sal_uInt32 nDiscreteWidth, const basegfx::BColor& rRGBColor) - : drawinglayer::primitive2d::BufDecPrimitive2D(), + : drawinglayer::primitive2d::BufferedDecompositionPrimitive2D(), maLogicRange(rLogicRange), mnDiscreteOffset(nDiscreteOffset), mnDiscreteWidth(nDiscreteWidth), @@ -1181,7 +1181,7 @@ public: sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; } const basegfx::BColor& getRGBColor() const { return maRGBColor; } - virtual bool operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; DeclPrimitrive2DIDBlock() }; @@ -1214,9 +1214,9 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } -bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufDecPrimitive2D& rPrimitive ) const +bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const { - if(drawinglayer::primitive2d::BufDecPrimitive2D::operator==(rPrimitive)) + if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { const MouseOverEffectPrimitive& rCompare = static_cast< const MouseOverEffectPrimitive& >(rPrimitive); -- cgit From 5cd6a50c1e2783b21340b7d6ee89e4e42221ffe7 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 17 Sep 2009 17:20:13 +0200 Subject: #i97509# added base class for 3d primitive, re-structured group primitives, added documentation --- .../view/SlsPageObjectViewObjectContact.cxx | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 7908b4730eac..e3215ebd8c9e 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -271,7 +271,7 @@ public: const basegfx::B2DRange& getPageObjectRange() const { return maRange; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; }; SdPageObjectBasePrimitive::SdPageObjectBasePrimitive(const basegfx::B2DRange& rRange) @@ -284,7 +284,7 @@ SdPageObjectBasePrimitive::~SdPageObjectBasePrimitive() { } -bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool SdPageObjectBasePrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { @@ -306,7 +306,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -319,13 +319,13 @@ public: const BitmapEx& getBitmapEx() const { return maBitmapEx; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectPageBitmapPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectPageBitmapPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // add bitmap primitive // to avoid scaling, use the Bitmap pixel size as primitive size @@ -358,7 +358,7 @@ SdPageObjectPageBitmapPrimitive::~SdPageObjectPageBitmapPrimitive() { } -bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool SdPageObjectPageBitmapPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -385,7 +385,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -399,7 +399,7 @@ public: const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorOffset(1); const sal_Int32 SdPageObjectSelectPrimitive::mnSelectionIndicatorThickness(3); -Primitive2DSequence SdPageObjectSelectPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectSelectPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -470,7 +470,7 @@ class SdPageObjectBorderPrimitive : public SdPageObjectBasePrimitive { protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -481,7 +481,7 @@ public: DeclPrimitrive2DIDBlock() }; -Primitive2DSequence SdPageObjectBorderPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectBorderPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // since old Width/Height calculations always added a single pixel value, // it is necessary to create a inner range which is one display unit less @@ -523,7 +523,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -536,7 +536,7 @@ public: const sal_Int32 SdPageObjectFocusPrimitive::mnFocusIndicatorOffset(2); -Primitive2DSequence SdPageObjectFocusPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFocusPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { Primitive2DSequence xRetval(2); @@ -618,7 +618,7 @@ private: protected: // method which is to be used to implement the local decomposition of a 2D primitive. - virtual Primitive2DSequence createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: // constructor and destructor @@ -641,7 +641,7 @@ public: bool getExcluded() const { return mbExcluded; } // compare operator - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; // provide unique ID DeclPrimitrive2DIDBlock() @@ -666,7 +666,7 @@ const BitmapEx& SdPageObjectFadeNameNumberPrimitive::getFadeEffectIconBitmap() c return *mpFadeEffectIconBitmap; } -Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::createLocal2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const +Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { const xub_StrLen nTextLength(getPageName().Len()); const sal_uInt32 nCount( @@ -866,7 +866,7 @@ SdPageObjectFadeNameNumberPrimitive::~SdPageObjectFadeNameNumberPrimitive() { } -bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool SdPageObjectFadeNameNumberPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(SdPageObjectBasePrimitive::operator==(rPrimitive)) { @@ -1159,7 +1159,7 @@ private: basegfx::BColor maRGBColor; protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createLocal2DDecomposition( + virtual drawinglayer::primitive2d::Primitive2DSequence create2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const; public: @@ -1181,12 +1181,12 @@ public: sal_uInt32 getDiscreteWidth() const { return mnDiscreteWidth; } const basegfx::BColor& getRGBColor() const { return maRGBColor; } - virtual bool operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const; + virtual bool operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const; DeclPrimitrive2DIDBlock() }; -drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createLocal2DDecomposition( +drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::create2DDecomposition( const drawinglayer::geometry::ViewInformation2D& rViewInformation) const { // get logic sizes in object coordinate system @@ -1214,7 +1214,7 @@ drawinglayer::primitive2d::Primitive2DSequence MouseOverEffectPrimitive::createL return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); } -bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BufferedDecompositionPrimitive2D& rPrimitive ) const +bool MouseOverEffectPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive2D& rPrimitive ) const { if(drawinglayer::primitive2d::BufferedDecompositionPrimitive2D::operator==(rPrimitive)) { -- cgit From 5d11f6a1ab4a569e8977bbd43f4582775a9e43c7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 19 Sep 2009 00:02:22 +0200 Subject: better dependencies for sdi files --- sd/sdi/ViewShellBase.sdi | 4 +-- sd/sdi/_docsh.sdi | 2 +- sd/sdi/docshell.sdi | 2 +- sd/sdi/grdocsh.sdi | 2 +- sd/sdi/makefile.mk | 14 ++++++-- sd/sdi/sdgslots.sdi | 9 +++-- sd/sdi/sdslots.sdi | 9 +++-- sd/sdi/svxitems.sdi | 93 ------------------------------------------------ 8 files changed, 29 insertions(+), 106 deletions(-) delete mode 100644 sd/sdi/svxitems.sdi (limited to 'sd') diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index 306fabf0df7d..67d9cfb1e85e 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -267,7 +267,7 @@ SfxVoidItem TaskPaneShowPanel SID_TASK_PANE ( GroupId = GID_VIEW; ] -interface ViewShellBaseView : View +interface ViewShellBaseView { SID_SWITCH_SHELL [ @@ -380,7 +380,7 @@ interface ViewShellBaseView : View ] } -shell ViewShellBase : SfxViewShell +shell ViewShellBase { import ViewShellBaseView[Automation]; } diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi index 15b6f52ffc01..6d3267aacf81 100644 --- a/sd/sdi/_docsh.sdi +++ b/sd/sdi/_docsh.sdi @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -interface DrawDocument : OfficeDocument +interface DrawDocument { SID_PACKNGO // ole : ?, status : ? [ diff --git a/sd/sdi/docshell.sdi b/sd/sdi/docshell.sdi index 13c979071b5c..159bd05227fc 100644 --- a/sd/sdi/docshell.sdi +++ b/sd/sdi/docshell.sdi @@ -35,7 +35,7 @@ interface ImpressDocument : DrawDocument { } -shell DrawDocShell : SfxObjectShell +shell DrawDocShell { import ImpressDocument[Automation]; } diff --git a/sd/sdi/grdocsh.sdi b/sd/sdi/grdocsh.sdi index 86cb36265704..4cd3ef0c905e 100644 --- a/sd/sdi/grdocsh.sdi +++ b/sd/sdi/grdocsh.sdi @@ -35,7 +35,7 @@ interface GraphicDocument : DrawDocument { } -shell GraphicDocShell : SfxObjectShell +shell GraphicDocShell { import GraphicDocument[Automation]; } diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index a442c65e8d64..8730d637e1a9 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -50,6 +50,11 @@ SDI2NAME=$(TARGET2) SIDHRCNAME=SDSLOTS.HRC SVSDI1DEPEND= \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ sdraw.sdi \ app.sdi \ _docsh.sdi \ @@ -69,7 +74,12 @@ SVSDI1DEPEND= \ $(PRJ)$/inc$/app.hrc SVSDI2DEPEND= \ - sdraw.sdi \ + $(SOLARINCXDIR)$/sfx2/sfx.sdi \ + $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ + $(SOLARINCXDIR)$/svx/svx.sdi \ + $(SOLARINCXDIR)$/svx/svxitems.sdi \ + $(SOLARINCXDIR)$/svx/xoitems.sdi \ + sdraw.sdi \ app.sdi \ _docsh.sdi \ grdocsh.sdi \ diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index da196204d6ca..b650a467f925 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -27,8 +27,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -import "svxslots.ilb" - module "2DADF501-1F00-101C-A2E4-00001B4C5CE7" "33A1C840-1F00-101C-A2E4-00001B4C5CE7" @@ -36,10 +34,15 @@ StarDraw [ HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) -TypeLibFile( "sdgslots.tlb" ) ModulePrefix( "Sd" ) ] { + include "sfxitems.sdi" + include "sfx.sdi" + include "svxitems.sdi" + include "xoitems.sdi" + include "svx.sdi" + item UINT16 TbxImageItem; enum FadeEffect diff --git a/sd/sdi/sdslots.sdi b/sd/sdi/sdslots.sdi index 83060f6dd36c..208613595b65 100644 --- a/sd/sdi/sdslots.sdi +++ b/sd/sdi/sdslots.sdi @@ -28,8 +28,6 @@ * ************************************************************************/ -import "svxslots.ilb" - module "2DADF501-1F00-101C-A2E4-00001B4C5CE7" "33A1C840-1F00-101C-A2E4-00001B4C5CE7" @@ -37,10 +35,15 @@ StarDraw [ HelpText( "StarDraw Application" ) SlotIdFile( "sdslots.hrc" ) -TypeLibFile( "sdslots.tlb" ) ModulePrefix( "Sd" ) ] { + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" + item UINT16 TbxImageItem; enum FadeEffect diff --git a/sd/sdi/svxitems.sdi b/sd/sdi/svxitems.sdi deleted file mode 100644 index 42d036d4e9d8..000000000000 --- a/sd/sdi/svxitems.sdi +++ /dev/null @@ -1,93 +0,0 @@ -enum SvxAdjust -{ - SVX_ADJUST_LEFT, - SVX_ADJUST_RIGHT, - SVX_ADJUST_BLOCK, - SVX_ADJUST_CENTER, - SVX_ADJUST_BLOCKLINE, - SVX_ADJUST_END -} - -item -{ - INT16 Red; - INT16 Green; - INT16 Blue; -} SvxColorItem - -item SvxAdjust SvxAdjustItem; - -item String SvxBoxInfoItem; - -item String SvxBoxItem; -item String SvxBrushItem; -item String SvxCaseMapItem; -item String SvxCharSetColorItem; -item String SvxColumnItem; -item String SvxContourItem; -item String SvxCrossedOutItem; -item String SvxDBDescMgr; -item String SvxDbTypeItem; -item String SvxEscapementItem; -item String SvxFmtBreakItem; -item String SvxFmtSplitItem; -item String SvxFontHeightItem; -item String SvxFontItem; -item String SvxFontListItem; -item String SvxHyphenZoneItem; -item String SvxInFrameItem; -item String SvxKerningItem; -item String SvxLRSpaceItem; -item String SvxLanguageItem; -item String SvxLineSpacingItem; -item String SvxMacroItem; -item String SvxNoHyphenItem; -item String SvxNoLinebreakItem; -item String SvxNumberInfoItem; -item String SvxOpaqueItem; -item String SvxOrphansItem; -item String SvxOverlineItem; -item String SvxPageItem; -item String SvxPageModelItem; -item String SvxPagePosSizeItem; -item String SvxPaperBinItem; -item String SvxParaDlgLimitsItem; -item String SvxPostItAuthorItem; -item String SvxPostItDateItem; -item String SvxPostItTextItem; -item String SvxPostureItem; -item String SvxPrintItem; -item String SvxPropSizeItem; -item String SvxProtectItem; -item String SvxPtrItem; -item String SvxRulerItem; -item String SvxSearchItem; -item String SvxSearchControllerItem; -item String SvxSearchItem; -item String SvxSetItem; -item String SvxShadowedItem; -item String SvxShadowItem; -item String SvxSizeItem; -item String SvxTabStopItem; -item String SvxULSpaceItem; -item String SvxUnderlineItem; -item String SvxWeightItem; -item String SvxWidowsItem; -item String SvxWordLineModeItem; -item String XFillAttrSetItem; -item String XFillBitmapItem; -item String XFillColorItem; -item String XFillGradientItem; -item String XFillHatchItem; -item String XFillStyleItem; -item String XLineAttrSetItem; -item String XLineColorItem; -item String XLineDashItem; -item String XLineEndItem; -item String XLineEndWidthItem; -item String XLineEndCenterItem; -item String XLineStartItem; -item String XLineStartWidthItem; -item String XLineStartCenterItem; -item String XLineStyleItem; -item String XLineWidthItem; -- cgit From 602841adb34579bcc9bb1ae3ec961753b8bd97f9 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 22 Sep 2009 18:14:05 +0200 Subject: #i97509# continued matrix tooling and adapting the usages now to all the ooo code --- sd/source/core/CustomAnimationEffect.cxx | 19 ++++++------------- sd/source/ui/animations/motionpathtag.cxx | 8 ++++---- sd/source/ui/func/fumorph.cxx | 16 +++++++--------- sd/source/ui/slideshow/slideshowviewimpl.cxx | 12 +++++------- sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 5 +++-- sd/source/ui/view/PrintManager.cxx | 7 ++++--- sd/source/ui/view/sdview.cxx | 10 ++++------ 7 files changed, 33 insertions(+), 44 deletions(-) (limited to 'sd') diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 23a04bf9d5ee..040bc7c0a78c 100644 --- a/sd/source/core/CustomAnimationEffect.cxx +++ b/sd/source/core/CustomAnimationEffect.cxx @@ -69,6 +69,7 @@ #include #include #include +#include #include @@ -1715,21 +1716,16 @@ void CustomAnimationEffect::updateSdrPathObjFromPath( SdrPathObj& rPathObj ) SdrObject* pObj = GetSdrObjectFromXShape( getTargetShape() ); if( pObj ) { - ::basegfx::B2DHomMatrix aTransform; - SdrPage* pPage = pObj->GetPage(); if( pPage ) { const Size aPageSize( pPage->GetSize() ); - aTransform.scale( (double)aPageSize.Width(), (double)aPageSize.Height() ); - xPolyPoly.transform( aTransform ); - aTransform.identity(); + xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix((double)aPageSize.Width(), (double)aPageSize.Height())); } const Rectangle aBoundRect( pObj->GetCurrentBoundRect() ); const Point aCenter( aBoundRect.Center() ); - aTransform.translate( aCenter.X(), aCenter.Y() ); - xPolyPoly.transform( aTransform ); + xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(aCenter.X(), aCenter.Y())); } } @@ -1748,17 +1744,14 @@ void CustomAnimationEffect::updatePathFromSdrPathObj( const SdrPathObj& rPathObj const Rectangle aBoundRect( pObj->GetCurrentBoundRect() ); const Point aCenter( aBoundRect.Center() ); - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( -aCenter.X(), -aCenter.Y() ); - xPolyPoly.transform( aTransform ); + xPolyPoly.transform(basegfx::tools::createTranslateB2DHomMatrix(-aCenter.X(), -aCenter.Y())); SdrPage* pPage = pObj->GetPage(); if( pPage ) { - aTransform.identity(); const Size aPageSize( pPage->GetSize() ); - aTransform.scale( 1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height() ); - xPolyPoly.transform( aTransform ); + xPolyPoly.transform(basegfx::tools::createScaleB2DHomMatrix( + 1.0 / (double)aPageSize.Width(), 1.0 / (double)aPageSize.Height())); } } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 887c6014f29c..4fc0ec0dc80e 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -36,6 +36,7 @@ #include #include +#include #include #include @@ -196,9 +197,8 @@ bool PathDragResize::EndSdrDrag(bool /*bCopy*/) SdrPathObj* pPathObj = mxTag->getPathObj(); if( pPathObj ) { - basegfx::B2DHomMatrix aTrans; const Point aRef( DragStat().Ref1() ); - aTrans.translate(-aRef.X(), -aRef.Y()); + basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aRef.X(), -aRef.Y())); aTrans.scale(double(aXFact), double(aYFact)); aTrans.translate(aRef.X(), aRef.Y()); basegfx::B2DPolyPolygon aDragPoly(pPathObj->GetPathPoly()); @@ -966,8 +966,8 @@ void MotionPathTag::addCustomHandles( SdrHdlList& rHandlerList ) ::com::sun::star::awt::Point aPos( mxOrigin->getPosition() ); if( (aPos.X != maOriginPos.X) || (aPos.Y != maOriginPos.Y) ) { - ::basegfx::B2DHomMatrix aTransform; - aTransform.translate( aPos.X - maOriginPos.X, aPos.Y - maOriginPos.Y ); + const basegfx::B2DHomMatrix aTransform(basegfx::tools::createTranslateB2DHomMatrix( + aPos.X - maOriginPos.X, aPos.Y - maOriginPos.Y)); mxPolyPoly.transform( aTransform ); mpPathObj->SetPathPoly( mxPolyPoly ); maOriginPos = aPos; diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 83851db28cae..db1dc120e478 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -42,13 +42,13 @@ #include #include - #include "View.hxx" #include "ViewShell.hxx" #include "Window.hxx" #include #include #include +#include #include "strings.hrc" #include "sdresid.hxx" @@ -264,9 +264,8 @@ void FuMorph::ImpEqualizePolyPointCount(::basegfx::B2DPolygon& rSmall, const ::b const ::basegfx::B2DPoint aSrcPos(aSrcSize.getCenter()); const ::basegfx::B2DRange aDstSize(::basegfx::tools::getRange(rSmall)); const ::basegfx::B2DPoint aDstPos(aDstSize.getCenter()); - ::basegfx::B2DHomMatrix aTrans; - aTrans.translate(-aSrcPos.getX(), -aSrcPos.getY()); + basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-aSrcPos.getX(), -aSrcPos.getY())); aTrans.scale(aDstSize.getWidth() / aSrcSize.getWidth(), aDstSize.getHeight() / aSrcSize.getHeight()); aTrans.translate(aDstPos.getX(), aDstPos.getY()); @@ -499,16 +498,15 @@ sal_Bool FuMorph::ImpMorphPolygons( for(sal_uInt16 i(0); i < nSteps; i++) { fValue += fFactor; - ::basegfx::B2DPolyPolygon* pNewPolyPoly3D = ImpCreateMorphedPolygon(rPolyPoly1, rPolyPoly2, fValue); + ::basegfx::B2DPolyPolygon* pNewPolyPoly2D = ImpCreateMorphedPolygon(rPolyPoly1, rPolyPoly2, fValue); - const ::basegfx::B2DRange aNewPolySize(::basegfx::tools::getRange(*pNewPolyPoly3D)); + const ::basegfx::B2DRange aNewPolySize(::basegfx::tools::getRange(*pNewPolyPoly2D)); const ::basegfx::B2DPoint aNewS(aNewPolySize.getCenter()); const ::basegfx::B2DPoint aRealS(aStartCenter + (aDelta * fValue)); - ::basegfx::B2DHomMatrix aTrans; const ::basegfx::B2DPoint aDiff(aRealS - aNewS); - aTrans.translate(aDiff.getX(), aDiff.getY()); - pNewPolyPoly3D->transform(aTrans); - rPolyPolyList3D.Insert(pNewPolyPoly3D, LIST_APPEND); + + pNewPolyPoly2D->transform(basegfx::tools::createTranslateB2DHomMatrix(aDiff)); + rPolyPolyList3D.Insert(pNewPolyPoly2D, LIST_APPEND); } } return TRUE; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index f4de77f03394..69190f68a0aa 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -38,6 +38,8 @@ #include #include +#include + #include #include @@ -384,16 +386,12 @@ geometry::AffineMatrix2D SAL_CALL SlideShowView::getTransformation( ) throw (Ru Point aOutputOffset( ( aWindowSize.Width() - aOutputSize.Width() ) >> 1, ( aWindowSize.Height() - aOutputSize.Height() ) >> 1 ); - ::basegfx::B2DHomMatrix aMatrix; - maPresentationArea = Rectangle( aOutputOffset, aOutputSize ); mrOutputWindow.SetPresentationArea( maPresentationArea ); - // scale presentation into available window rect (minus 10%) - aMatrix.scale( aOutputSize.Width(), aOutputSize.Height() ); - - // center in the window - aMatrix.translate( aOutputOffset.X(), aOutputOffset.Y() ); + // scale presentation into available window rect (minus 10%); center in the window + const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createScaleTranslateB2DHomMatrix( + aOutputSize.Width(), aOutputSize.Height(), aOutputOffset.X(), aOutputOffset.Y())); geometry::AffineMatrix2D aRes; diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index 5e338480e236..7d9887d9b8b1 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx @@ -55,6 +55,8 @@ #include #include #include +#include + #include #include #include @@ -245,8 +247,7 @@ void SubstitutionOverlay::Clear (void) void SubstitutionOverlay::Move (const Point& rOffset) { - basegfx::B2DHomMatrix aTranslation; - aTranslation.translate(rOffset.X(), rOffset.Y()); + const basegfx::B2DHomMatrix aTranslation(basegfx::tools::createTranslateB2DHomMatrix(rOffset.X(), rOffset.Y())); maShapes.transform(aTranslation); maPosition += rOffset; diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx index 34e3c780d14e..667ef7419cbc 100644 --- a/sd/source/ui/view/PrintManager.cxx +++ b/sd/source/ui/view/PrintManager.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include "PrintManager.hxx" @@ -1775,10 +1776,10 @@ void PrintManager::InitHandoutTemplate( PrintInfo& /*rInfo*/, USHORT nSlidesPerH aPoly.insert(0, basegfx::B2DPoint( aRect.Left(), aRect.Top() ) ); aPoly.insert(1, basegfx::B2DPoint( aRect.Right(), aRect.Top() ) ); - basegfx::B2DHomMatrix aMatrix; - aMatrix.translate( 0.0, static_cast< double >( aRect.GetHeight() / 7 ) ); - + const basegfx::B2DHomMatrix aMatrix(basegfx::tools::createTranslateB2DHomMatrix( + 0.0, static_cast< double >( aRect.GetHeight() / 7 ))); basegfx::B2DPolyPolygon aPathPoly; + for( sal_uInt16 nLine = 0; nLine < 7; nLine++ ) { aPoly.transform( aMatrix ); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 9a63afc03479..a387e7b6450d 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -99,6 +99,7 @@ #include #include #include +#include #include @@ -454,12 +455,9 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP false)); // fill text matrix - basegfx::B2DHomMatrix aTextMatrix; - - aTextMatrix.scale(aSize.getX(), aSize.getY()); - aTextMatrix.shearX(fShearX); - aTextMatrix.rotate(fRotate); - aTextMatrix.translate(fPosX, fPosY); + const basegfx::B2DHomMatrix aTextMatrix(basegfx::tools::createScaleShearXRotateTranslateB2DHomMatrix( + aSize.getX(), aSize.getY(), + fShearX, fRotate, fPosX, fPosY)); // create DXTextArray (can be empty one) const ::std::vector< double > aDXArray; -- cgit From 6a29332498a5c01bbeddaded08395412b3da63d6 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 24 Sep 2009 14:09:17 +0200 Subject: #i105304# corrected destructors for OverlayBase derivations --- .../ui/slidesorter/inc/view/SlsViewOverlay.hxx | 3 +++ sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 31 +++++++++++++++++++--- sd/source/ui/unoidl/unopage.cxx | 17 +++++++++++- 3 files changed, 47 insertions(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx index 1d99584bec4b..93798e095871 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsViewOverlay.hxx @@ -89,6 +89,7 @@ protected: OverlayManager. This registration is done on demand. */ void EnsureRegistration (void); + void RemoveRegistration(); }; @@ -147,6 +148,7 @@ class SelectionRectangleOverlay { public: SelectionRectangleOverlay (ViewOverlay& rViewOverlay); + virtual ~SelectionRectangleOverlay(); void Start (const Point& rAnchor); void Update (const Point& rSecondCorner); @@ -176,6 +178,7 @@ class InsertionIndicatorOverlay { public: InsertionIndicatorOverlay (ViewOverlay& rViewOverlay); + virtual ~InsertionIndicatorOverlay(); /** Given a position in model coordinates this method calculates the insertion marker both as an index in the document and as a rectangle diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index 7d9887d9b8b1..0cad1985ce35 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx @@ -167,9 +167,7 @@ OverlayBase::OverlayBase (ViewOverlay& rViewOverlay) OverlayBase::~OverlayBase (void) { - OverlayManager* pOverlayManager = getOverlayManager(); - if (pOverlayManager != NULL) - pOverlayManager->remove(*this); + OSL_ENSURE(!getOverlayManager(), "Please call RemoveRegistration() in the derived class; it's too late to call it in the base class since virtual methods will be missing when called in the destructor."); } @@ -188,6 +186,16 @@ void OverlayBase::EnsureRegistration (void) +void OverlayBase::RemoveRegistration() +{ + OverlayManager* pOverlayManager = getOverlayManager(); + if (pOverlayManager != NULL) + pOverlayManager->remove(*this); +} + + + + //===== SubstitutionOverlay ================================================= SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay) @@ -202,6 +210,7 @@ SubstitutionOverlay::SubstitutionOverlay (ViewOverlay& rViewOverlay) SubstitutionOverlay::~SubstitutionOverlay (void) { + RemoveRegistration(); } @@ -317,6 +326,13 @@ SelectionRectangleOverlay::SelectionRectangleOverlay (ViewOverlay& rViewOverlay) +SelectionRectangleOverlay::~SelectionRectangleOverlay() +{ + RemoveRegistration(); +} + + + Rectangle SelectionRectangleOverlay::GetSelectionRectangle (void) { @@ -392,6 +408,14 @@ InsertionIndicatorOverlay::InsertionIndicatorOverlay (ViewOverlay& rViewOverlay) +InsertionIndicatorOverlay::~InsertionIndicatorOverlay() +{ + RemoveRegistration(); +} + + + + void InsertionIndicatorOverlay::SetPositionAndSize (const Rectangle& aNewBoundingBox) { EnsureRegistration(); @@ -510,6 +534,7 @@ MouseOverIndicatorOverlay::MouseOverIndicatorOverlay (ViewOverlay& rViewOverlay) MouseOverIndicatorOverlay::~MouseOverIndicatorOverlay (void) { + RemoveRegistration(); } diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 4a01c995544b..44d1ecea9031 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -316,6 +316,7 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind ) { MAP_CHAR_LEN(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, &::getCppuType((const view::PaperOrientation*)0),0, 0}, + { MAP_CHAR_LEN(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, &::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, &::getCppuType((const sal_Int32*)0), 0, 0}, { MAP_CHAR_LEN(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, &::getCppuType((const sal_Int16*)0), 0, 0}, { MAP_CHAR_LEN(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, &::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, @@ -991,7 +992,21 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const OUString& PropertyName ) aAny <<= (sal_Int16)( GetPage()->GetAutoLayout() ); break; case WID_PAGE_NUMBER: - aAny <<= (sal_Int16)((sal_uInt16)((GetPage()->GetPageNum()-1)>>1) + 1); + { + const sal_uInt16 nPageNumber(GetPage()->GetPageNum()); + + if(nPageNumber > 0) + { + // for all other pages calculate the number + aAny <<= (sal_Int16)((sal_uInt16)((nPageNumber-1)>>1) + 1); + } + else + { + // for pages with number 0 (Handout Master, Handout page) + // return 0 + aAny <<= (sal_Int16)0; + } + } break; case WID_PAGE_DURATION: aAny <<= (sal_Int32)(GetPage()->GetTime()); -- cgit From 4039d960fc2555b7043e2e6df24855b5ffcbb02f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 25 Sep 2009 21:06:42 +0200 Subject: #103496#: forgot on sdi file in sd --- sd/sdi/sdgslots.sdi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/sdi/sdgslots.sdi b/sd/sdi/sdgslots.sdi index b650a467f925..db62ca5cdfb3 100644 --- a/sd/sdi/sdgslots.sdi +++ b/sd/sdi/sdgslots.sdi @@ -37,11 +37,11 @@ SlotIdFile( "sdslots.hrc" ) ModulePrefix( "Sd" ) ] { - include "sfxitems.sdi" - include "sfx.sdi" - include "svxitems.sdi" - include "xoitems.sdi" - include "svx.sdi" + include "sfx2/sfxitems.sdi" + include "sfx2/sfx.sdi" + include "svx/svxitems.sdi" + include "svx/xoitems.sdi" + include "svx/svx.sdi" item UINT16 TbxImageItem; -- cgit From a0aea0374c174fe24cfff31f1589aca62bdb4d68 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 28 Sep 2009 17:17:07 +0200 Subject: merge problems --- sd/sdi/makefile.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'sd') diff --git a/sd/sdi/makefile.mk b/sd/sdi/makefile.mk index 8f55ef10e21d..7eb22a96c770 100644 --- a/sd/sdi/makefile.mk +++ b/sd/sdi/makefile.mk @@ -72,7 +72,6 @@ SVSDI1DEPEND= \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ sdslots.hrc \ - $(SOLARINCXDIR)$/svxslots.ilb \ $(PRJ)$/inc$/app.hrc SVSDI2DEPEND= \ @@ -95,7 +94,6 @@ SVSDI2DEPEND= \ ViewShellBase.sdi \ TaskPaneViewShell.sdi \ sdslots.hrc \ - $(SOLARINCXDIR)$/svxslots.ilb \ $(PRJ)$/inc$/app.hrc # --- Targets ------------------------------------------------------- -- cgit From aaa550781532849b514e1e61ace3c7db9e3db68a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 6 Oct 2009 07:38:24 +0200 Subject: #103496#: move VCL free ConfigItems to unotools --- sd/inc/pch/precompiled_sd.hxx | 16 ++++++++-------- sd/source/core/CustomAnimationPreset.cxx | 2 +- sd/source/core/TransitionPreset.cxx | 2 +- sd/source/core/drawdoc.cxx | 10 +++++----- sd/source/filter/grf/sdgrffilter.cxx | 2 +- sd/source/filter/html/buttonset.cxx | 2 +- sd/source/filter/html/htmlex.cxx | 2 +- sd/source/filter/html/pubdlg.cxx | 4 ++-- sd/source/filter/ppt/pptin.cxx | 4 ++-- sd/source/filter/sdpptwrp.cxx | 2 +- sd/source/filter/xml/sdxmlwrp.cxx | 2 +- sd/source/ui/animations/AnimationSchemesPane.cxx | 2 +- sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 2 +- sd/source/ui/animations/CustomAnimationDialog.cxx | 2 +- sd/source/ui/animations/SlideTransitionPane.cxx | 2 +- sd/source/ui/annotations/annotationmanager.cxx | 4 ++-- sd/source/ui/annotations/annotationwindow.cxx | 4 ++-- sd/source/ui/app/sddll.cxx | 2 +- sd/source/ui/app/sddll1.cxx | 2 +- sd/source/ui/app/sdmod.cxx | 2 +- sd/source/ui/app/sdmod1.cxx | 4 ++-- sd/source/ui/app/sdmod2.cxx | 2 +- sd/source/ui/app/sdpopup.cxx | 2 +- sd/source/ui/dlg/dlgass.cxx | 2 +- sd/source/ui/dlg/dlgassim.cxx | 2 +- sd/source/ui/dlg/dlgfield.cxx | 2 +- sd/source/ui/dlg/tpaction.cxx | 2 +- sd/source/ui/docshell/docshel4.cxx | 4 ++-- sd/source/ui/func/fuinsert.cxx | 2 +- sd/source/ui/notes/EditWindow.cxx | 4 ++-- sd/source/ui/presenter/PresenterTextView.cxx | 4 ++-- sd/source/ui/slideshow/slideshowimpl.hxx | 4 ++-- sd/source/ui/slideshow/slideshowviewimpl.hxx | 4 ++-- sd/source/ui/unoidl/sddetect.cxx | 2 +- sd/source/ui/view/Outliner.cxx | 4 ++-- sd/source/ui/view/drviews7.cxx | 2 +- sd/source/ui/view/drviewsb.cxx | 2 +- sd/source/ui/view/outlnvs2.cxx | 2 +- sd/source/ui/view/sdview3.cxx | 2 +- sd/source/ui/view/viewshe2.cxx | 2 +- sd/util/makefile.mk | 1 + 41 files changed, 63 insertions(+), 62 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index e3329a44af7e..60e3e3aa069a 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -509,10 +509,10 @@ #include "svtools/filter.hxx" #include "svtools/flagitem.hxx" #include "svtools/fltcall.hxx" -#include "svtools/fltrcfg.hxx" +#include "unotools/fltrcfg.hxx" #include "svtools/globalnameitem.hxx" #include "svtools/hint.hxx" -#include "svtools/historyoptions.hxx" +#include "unotools/historyoptions.hxx" #include "svtools/htmlout.hxx" #include "svtools/imap.hxx" #include "svtools/imapcirc.hxx" @@ -526,18 +526,18 @@ #include "svtools/itemset.hxx" #include "svtools/languageoptions.hxx" #include "svtools/lckbitem.hxx" -#include "svtools/lingucfg.hxx" -#include "svtools/linguprops.hxx" +#include "unotools/lingucfg.hxx" +#include "unotools/linguprops.hxx" #include "svtools/listener.hxx" #include "svtools/lstner.hxx" #include "svtools/misccfg.hxx" -#include "svtools/pathoptions.hxx" +#include "unotools/pathoptions.hxx" #include "svtools/poolitem.hxx" #include "svtools/prgsbar.hxx" #include "svtools/printdlg.hxx" #include "svtools/ptitem.hxx" #include "svtools/rectitem.hxx" -#include "svtools/saveopt.hxx" +#include "unotools/saveopt.hxx" #include "svtools/sfxecode.hxx" #include "svtools/slstitm.hxx" #include "svtools/smplhint.hxx" @@ -557,9 +557,9 @@ #include "svtools/unoimap.hxx" #include "svtools/urihelper.hxx" #include "svtools/urlbmk.hxx" -#include "svtools/useroptions.hxx" +#include "unotools/useroptions.hxx" #include "svtools/valueset.hxx" -#include "svtools/viewoptions.hxx" +#include "unotools/viewoptions.hxx" #include "svtools/visitem.hxx" #include "svtools/whiter.hxx" #include "svtools/wmf.hxx" diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index cf5d94c420ce..6a732e58a405 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 563026fdc1ac..59251f62eb6f 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index d5cd14a80b65..d8d6552c696c 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -42,7 +42,7 @@ #include #include -#include +#include #ifndef _OFA_MISCCFG_HXX #include @@ -71,16 +71,16 @@ #include #include #include -#include +#include #include #include #include #include #ifndef _SVTOOLS_PATHOPTIONS_HXX_ -#include +#include #endif -#include -#include +#include +#include #include "eetext.hxx" #include "drawdoc.hxx" diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index bb3c114f603f..5ef6123fdddf 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -60,7 +60,7 @@ // -- #include -#include +#include #include #include #include diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index c2942f6b5b8f..2671452a0a3b 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 6e2a7feb5240..b89c6238dcaa 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index aec387604488..7b0f8486f7bd 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -60,8 +60,8 @@ #include #include #include -#include -#include +#include +#include #include "sdresid.hxx" #include "sdattr.hxx" diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index b13935699b0f..2ea34ab831e4 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -88,11 +88,11 @@ #include "../../ui/inc/FrameView.hxx" #include "../../ui/inc/optsitem.hxx" -#include +#include #include #include #include -#include +#include #include #define MAX_USER_MOVE 2 diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index 8c1674dbf789..bc4a63012caa 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "sdpptwrp.hxx" #include "ppt/pptin.hxx" diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 6f9e0d7b71da..fa127ec752dd 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -67,7 +67,7 @@ #include #include #include -#include +#include // #80365# include necessary for XML progress bar at load time #include diff --git a/sd/source/ui/animations/AnimationSchemesPane.cxx b/sd/source/ui/animations/AnimationSchemesPane.cxx index 02a230650583..51ddad2fb97d 100644 --- a/sd/source/ui/animations/AnimationSchemesPane.cxx +++ b/sd/source/ui/animations/AnimationSchemesPane.cxx @@ -49,7 +49,7 @@ #include #endif #include -#include +#include #include #include diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index ce651b2965be..ea59e0773261 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -53,7 +53,7 @@ #include #include #include "sdresid.hxx" -#include +#include #include #include "CustomAnimationCreateDialog.hxx" #ifndef _SD_CUSTOMANIMATIONCREATEDIALOG_HRC diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index dc7a27ab5c53..9a1634a7f695 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -52,7 +52,7 @@ #ifndef _UNOTOOLS_PROCESSFACTORY_HXX #include #endif -#include +#include #include #include #include diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 13400964c18b..4a235e3cd9af 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -51,7 +51,7 @@ #include #endif #include -#include +#include #include #include #include "DrawViewShell.hxx" diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 144022d10758..d339da99c96c 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -47,9 +47,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index ae3c65a2b4d5..c285986452ca 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -58,8 +58,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index c2ab152d950b..7cdec8c9f36b 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -34,7 +34,7 @@ #include #include -#include +#include #ifndef _FM_FMOBJFAC_HXX #include #endif diff --git a/sd/source/ui/app/sddll1.cxx b/sd/source/ui/app/sddll1.cxx index 2ef0815aed3c..6b525a0b3f90 100644 --- a/sd/source/ui/app/sddll1.cxx +++ b/sd/source/ui/app/sddll1.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" -#include +#include #include "sddll.hxx" #include "diactrl.hxx" #include "tbx_ww.hxx" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index f7e74a481740..9a331f8c73f2 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include #include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 4144b4afb774..8c6903d3bb7c 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "framework/FrameworkHelper.hxx" #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "app.hrc" #include "glob.hrc" diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index bbf80e942602..410af582283a 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index 211e3a1fd02e..dc4246d57888 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "strings.hrc" #include "sdpopup.hxx" diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 13ad351c7b24..84259a54f66b 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -66,7 +66,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx index 0b394d57702b..a1781ec2d9dc 100644 --- a/sd/source/ui/dlg/dlgassim.cxx +++ b/sd/source/ui/dlg/dlgassim.cxx @@ -36,7 +36,7 @@ #endif #include #include -#include +#include #include "sdpage.hxx" #include "Outliner.hxx" diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 99fcace44186..7ec89ac9a000 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "strings.hrc" #include "dlgfield.hrc" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 2148b33d95d3..d6e379ce50fc 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 4a4e62f2a106..37045e9d0731 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -63,11 +63,11 @@ #include "unomodel.hxx" #endif -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 12c94fbf9f8f..dfff1da8207e 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index f86e9a358cbc..89c45decd123 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 0317b7530e5c..2fc4245269ec 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b9d5506ff2f3..5ae10b9ca872 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -62,8 +62,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 8eebe162b942..4d2ecbdef39c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -56,8 +56,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 71000d263cd7..60968fa9a51c 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx index 233976585e58..ecfebc9a3cac 100644 --- a/sd/source/ui/view/Outliner.cxx +++ b/sd/source/ui/view/Outliner.cxx @@ -56,8 +56,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 983033be7b8c..91136028fd4d 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 9a94cae21983..09e71dc547ac 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 99fbcb7f2eda..6b078c5f28cc 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -49,7 +49,7 @@ #include #include #include "optsitem.hxx" -#include +#include #include #include "Outliner.hxx" diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 184949f4e683..1e9e39383bec 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #ifndef _EDITDATA_HXX #include #endif diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx index 0349388577eb..08a39c44d86a 100644 --- a/sd/source/ui/view/viewshe2.cxx +++ b/sd/source/ui/view/viewshe2.cxx @@ -59,7 +59,7 @@ #include #include #include -#include +#include #ifndef _SVX_DIALOGS_HRC #include #endif diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index cf9a516094b7..e530511ee565 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -171,6 +171,7 @@ SHL2STDLIBS= \ $(VCLLIB) \ $(SOTLIB) \ $(TOOLSLIB) \ + $(UNOTOOLSLIB) \ $(UCBHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ -- cgit From 0cc66aaf7546862d515041edb9243988a3fcdd1b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Oct 2009 00:05:16 +0200 Subject: #i103496#: split svtools; improve ConfitItems --- sd/inc/helpids.h | 2 +- sd/inc/pch/precompiled_sd.hxx | 68 +++++++++++----------- sd/inc/sdattr.hxx | 6 +- sd/inc/sdmod.hxx | 2 +- sd/inc/sdundo.hxx | 2 +- sd/inc/stlfamily.hxx | 2 +- sd/inc/stlsheet.hxx | 2 +- sd/inc/undo/undomanager.hxx | 2 +- sd/source/core/anminfo.cxx | 4 +- sd/source/core/drawdoc.cxx | 8 +-- sd/source/core/drawdoc2.cxx | 2 +- sd/source/core/drawdoc3.cxx | 4 +- sd/source/core/drawdoc4.cxx | 4 +- sd/source/core/sdpage.cxx | 2 +- sd/source/core/sdpage2.cxx | 4 +- sd/source/core/stlfamily.cxx | 2 +- sd/source/core/stlpool.cxx | 8 +-- sd/source/core/stlsheet.cxx | 4 +- sd/source/core/typemap.cxx | 12 ++-- sd/source/filter/cgm/sdcgmfilter.cxx | 2 +- sd/source/filter/eppt/epptso.cxx | 2 +- sd/source/filter/html/htmlex.cxx | 6 +- sd/source/filter/html/htmlex.hxx | 2 +- sd/source/filter/html/pubdlg.cxx | 10 ++-- sd/source/filter/ppt/pptin.cxx | 8 +-- sd/source/filter/sdfilter.cxx | 2 +- sd/source/filter/xml/sdtransform.cxx | 8 +-- sd/source/filter/xml/sdxmlwrp.cxx | 4 +- sd/source/ui/annotations/annotationmanager.cxx | 6 +- sd/source/ui/annotations/annotationwindow.cxx | 6 +- sd/source/ui/app/optsitem.cxx | 6 +- sd/source/ui/app/res_bmp.src | 2 +- sd/source/ui/app/sdmod.cxx | 6 +- sd/source/ui/app/sdmod1.cxx | 2 +- sd/source/ui/app/sdmod2.cxx | 8 +-- sd/source/ui/app/sdpopup.cxx | 2 +- sd/source/ui/app/sdxfer.cxx | 4 +- sd/source/ui/app/tbxww.cxx | 2 +- sd/source/ui/app/tmplctrl.cxx | 4 +- sd/source/ui/dlg/LayerDialogContent.cxx | 2 +- sd/source/ui/dlg/animobjs.cxx | 2 +- sd/source/ui/dlg/celltempl.cxx | 4 +- sd/source/ui/dlg/dlgass.cxx | 4 +- sd/source/ui/dlg/dlgassim.hxx | 2 +- sd/source/ui/dlg/dlgchar.cxx | 2 +- sd/source/ui/dlg/dlgfield.cxx | 4 +- sd/source/ui/dlg/dlgolbul.cxx | 6 +- sd/source/ui/dlg/dlgpage.cxx | 4 +- sd/source/ui/dlg/dlgsnap.cxx | 4 +- sd/source/ui/dlg/gluectrl.cxx | 2 +- sd/source/ui/dlg/layeroptionsdlg.cxx | 2 +- sd/source/ui/dlg/morphdlg.cxx | 4 +- sd/source/ui/dlg/navigatr.cxx | 6 +- sd/source/ui/dlg/paragr.cxx | 6 +- sd/source/ui/dlg/present.cxx | 2 +- sd/source/ui/dlg/prltempl.cxx | 6 +- sd/source/ui/dlg/prntopts.cxx | 2 +- sd/source/ui/dlg/sdpreslt.cxx | 2 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/dlg/tabtempl.cxx | 6 +- sd/source/ui/dlg/tpaction.cxx | 4 +- sd/source/ui/dlg/tpoption.cxx | 2 +- sd/source/ui/dlg/unchss.cxx | 6 +- sd/source/ui/docshell/docshel3.cxx | 2 +- sd/source/ui/docshell/docshel4.cxx | 6 +- sd/source/ui/docshell/docshell.cxx | 12 ++-- sd/source/ui/docshell/formatclipboard.cxx | 4 +- sd/source/ui/framework/tools/FrameworkHelper.cxx | 2 +- sd/source/ui/func/bulmaper.cxx | 4 +- sd/source/ui/func/fuarea.cxx | 4 +- sd/source/ui/func/fubullet.cxx | 6 +- sd/source/ui/func/fucon3d.cxx | 2 +- sd/source/ui/func/fuconarc.cxx | 4 +- sd/source/ui/func/fuconbez.cxx | 4 +- sd/source/ui/func/fuconcs.cxx | 6 +- sd/source/ui/func/fuconrec.cxx | 4 +- sd/source/ui/func/fuconstr.cxx | 2 +- sd/source/ui/func/fuconuno.cxx | 4 +- sd/source/ui/func/fudraw.cxx | 2 +- sd/source/ui/func/fuediglu.cxx | 2 +- sd/source/ui/func/fuhhconv.cxx | 2 +- sd/source/ui/func/fuinsert.cxx | 6 +- sd/source/ui/func/fuinsfil.cxx | 4 +- sd/source/ui/func/fuline.cxx | 4 +- sd/source/ui/func/fuoaprms.cxx | 2 +- sd/source/ui/func/fuolbull.cxx | 4 +- sd/source/ui/func/fupage.cxx | 8 +-- sd/source/ui/func/fupoor.cxx | 2 +- sd/source/ui/func/fuprlout.cxx | 4 +- sd/source/ui/func/fuprobjs.cxx | 4 +- sd/source/ui/func/fusel.cxx | 8 +-- sd/source/ui/func/fusldlg.cxx | 2 +- sd/source/ui/func/fusnapln.cxx | 2 +- sd/source/ui/func/futempl.cxx | 2 +- sd/source/ui/func/futext.cxx | 6 +- sd/source/ui/inc/AccessibleOutlineEditSource.hxx | 4 +- sd/source/ui/inc/EventMultiplexer.hxx | 2 +- sd/source/ui/inc/FormShellManager.hxx | 2 +- sd/source/ui/inc/PreviewRenderer.hxx | 2 +- sd/source/ui/inc/ViewShellHint.hxx | 2 +- sd/source/ui/inc/WindowUpdater.hxx | 8 +-- sd/source/ui/inc/diactrl.hxx | 2 +- sd/source/ui/inc/docprev.hxx | 2 +- sd/source/ui/inc/formatclipboard.hxx | 2 +- sd/source/ui/inc/fuconuno.hxx | 2 +- sd/source/ui/inc/fuformatpaintbrush.hxx | 2 +- sd/source/ui/inc/optsitem.hxx | 1 + sd/source/ui/inc/sdtreelb.hxx | 2 +- sd/source/ui/inc/sdxfer.hxx | 2 +- sd/source/ui/inc/unomodel.hxx | 2 +- sd/source/ui/notes/EditWindow.cxx | 2 +- sd/source/ui/presenter/PresenterTextView.cxx | 4 +- sd/source/ui/slideshow/showwin.cxx | 2 +- sd/source/ui/slideshow/slideshow.cxx | 2 +- sd/source/ui/slideshow/slideshowimpl.cxx | 4 +- .../ui/slidesorter/controller/SlsListener.hxx | 2 +- .../ui/slidesorter/controller/SlsSlotManager.cxx | 8 +-- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 6 +- sd/source/ui/table/TableDesignPane.cxx | 2 +- sd/source/ui/table/tablefunction.cxx | 4 +- sd/source/ui/table/tableobjectbar.cxx | 4 +- sd/source/ui/toolpanel/LayoutMenu.cxx | 2 +- sd/source/ui/toolpanel/TitleBar.cxx | 2 +- .../ui/toolpanel/controls/MasterPageContainer.cxx | 4 +- .../ui/toolpanel/controls/MasterPageObserver.cxx | 2 +- .../ui/toolpanel/controls/MasterPagesSelector.cxx | 8 +-- sd/source/ui/unoidl/sddetect.cxx | 6 +- sd/source/ui/unoidl/unoobj.cxx | 4 +- sd/source/ui/unoidl/unopage.cxx | 4 +- sd/source/ui/unoidl/unopage.hxx | 2 +- sd/source/ui/unoidl/unopback.cxx | 2 +- sd/source/ui/view/GraphicObjectBar.cxx | 6 +- sd/source/ui/view/MediaObjectBar.cxx | 4 +- sd/source/ui/view/PrintManager.cxx | 12 ++-- sd/source/ui/view/ToolBarManager.cxx | 2 +- sd/source/ui/view/ViewShellBase.cxx | 2 +- sd/source/ui/view/ViewShellImplementation.cxx | 2 +- sd/source/ui/view/WindowUpdater.cxx | 54 ++++++++--------- sd/source/ui/view/drawview.cxx | 8 +-- sd/source/ui/view/drbezob.cxx | 4 +- sd/source/ui/view/drtxtob.cxx | 10 ++-- sd/source/ui/view/drtxtob1.cxx | 10 ++-- sd/source/ui/view/drviews2.cxx | 2 +- sd/source/ui/view/drviews3.cxx | 12 ++-- sd/source/ui/view/drviews4.cxx | 2 +- sd/source/ui/view/drviews7.cxx | 14 ++--- sd/source/ui/view/drviews9.cxx | 6 +- sd/source/ui/view/drviewsa.cxx | 6 +- sd/source/ui/view/drviewsc.cxx | 2 +- sd/source/ui/view/drviewsd.cxx | 6 +- sd/source/ui/view/drviewse.cxx | 10 ++-- sd/source/ui/view/drviewsf.cxx | 8 +-- sd/source/ui/view/drviewsh.cxx | 4 +- sd/source/ui/view/drviewsi.cxx | 2 +- sd/source/ui/view/drviewsj.cxx | 2 +- sd/source/ui/view/outlnvs2.cxx | 2 +- sd/source/ui/view/outlnvsh.cxx | 6 +- sd/source/ui/view/outlview.cxx | 6 +- sd/source/ui/view/sdruler.cxx | 2 +- sd/source/ui/view/sdview2.cxx | 4 +- sd/source/ui/view/sdview3.cxx | 4 +- sd/source/ui/view/sdview4.cxx | 2 +- sd/source/ui/view/viewshe3.cxx | 7 +-- sd/source/ui/view/viewshel.cxx | 4 +- 164 files changed, 392 insertions(+), 396 deletions(-) (limited to 'sd') diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index e094027f9417..00268058745b 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -28,7 +28,7 @@ * ************************************************************************/ #ifndef _SOLAR_HRC -#include +#include #endif #define HID_SD_PRINT_OPTIONS (HID_SD_START + 0) diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 60e3e3aa069a..1c236c9b290e 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -495,23 +495,23 @@ #include "sot/storinfo.hxx" #include "svtools/FilterConfigItem.hxx" -#include "svtools/aeitem.hxx" -#include "svtools/brdcst.hxx" +#include "svl/aeitem.hxx" +#include "svl/brdcst.hxx" #include "svtools/colorcfg.hxx" #include "svtools/colrdlg.hxx" #include "svtools/controldims.hrc" -#include "svtools/ctloptions.hxx" +#include "svl/ctloptions.hxx" #include "svtools/ctrlbox.hxx" #include "svtools/ctrltool.hxx" #include "svtools/ehdl.hxx" -#include "svtools/eitem.hxx" +#include "svl/eitem.hxx" #include "svtools/filedlg.hxx" #include "svtools/filter.hxx" -#include "svtools/flagitem.hxx" +#include "svl/flagitem.hxx" #include "svtools/fltcall.hxx" #include "unotools/fltrcfg.hxx" -#include "svtools/globalnameitem.hxx" -#include "svtools/hint.hxx" +#include "svl/globalnameitem.hxx" +#include "svl/hint.hxx" #include "unotools/historyoptions.hxx" #include "svtools/htmlout.hxx" #include "svtools/imap.hxx" @@ -519,51 +519,51 @@ #include "svtools/imapobj.hxx" #include "svtools/imappoly.hxx" #include "svtools/imaprect.hxx" -#include "svtools/inethist.hxx" -#include "svtools/intitem.hxx" -#include "svtools/itemiter.hxx" -#include "svtools/itempool.hxx" -#include "svtools/itemset.hxx" -#include "svtools/languageoptions.hxx" -#include "svtools/lckbitem.hxx" +#include "svl/inethist.hxx" +#include "svl/intitem.hxx" +#include "svl/itemiter.hxx" +#include "svl/itempool.hxx" +#include "svl/itemset.hxx" +#include "svl/languageoptions.hxx" +#include "svl/lckbitem.hxx" #include "unotools/lingucfg.hxx" #include "unotools/linguprops.hxx" -#include "svtools/listener.hxx" -#include "svtools/lstner.hxx" -#include "svtools/misccfg.hxx" +#include "svl/listener.hxx" +#include "svl/lstner.hxx" +#include "unotools/misccfg.hxx" #include "unotools/pathoptions.hxx" -#include "svtools/poolitem.hxx" +#include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" #include "svtools/printdlg.hxx" -#include "svtools/ptitem.hxx" -#include "svtools/rectitem.hxx" +#include "svl/ptitem.hxx" +#include "svl/rectitem.hxx" #include "unotools/saveopt.hxx" #include "svtools/sfxecode.hxx" -#include "svtools/slstitm.hxx" -#include "svtools/smplhint.hxx" +#include "svl/slstitm.hxx" +#include "svl/smplhint.hxx" #include "svtools/soerr.hxx" -#include "svtools/solar.hrc" +#include "svl/solar.hrc" #include "svtools/sores.hxx" #include "svtools/stdctrl.hxx" -#include "svtools/stritem.hxx" -#include "svtools/style.hrc" -#include "svtools/style.hxx" +#include "svl/stritem.hxx" +#include "svl/style.hrc" +#include "svl/style.hxx" #include "svtools/svmedit.hxx" -#include "svtools/svstdarr.hxx" -#include "svtools/syslocale.hxx" +#include "svl/svstdarr.hxx" +#include "unotools/syslocale.hxx" #include "svtools/tabbar.hxx" #include "svtools/treelist.hxx" -#include "svtools/undo.hxx" +#include "svl/undo.hxx" #include "svtools/unoimap.hxx" -#include "svtools/urihelper.hxx" -#include "svtools/urlbmk.hxx" +#include "svl/urihelper.hxx" +#include "svl/urlbmk.hxx" #include "unotools/useroptions.hxx" #include "svtools/valueset.hxx" #include "unotools/viewoptions.hxx" -#include "svtools/visitem.hxx" -#include "svtools/whiter.hxx" +#include "svl/visitem.hxx" +#include "svl/whiter.hxx" #include "svtools/wmf.hxx" -#include "svtools/zforlist.hxx" +#include "svl/zforlist.hxx" #include "svx/SpellDialogChildWindow.hxx" diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx index 5600302c40ff..1972ad1583d3 100644 --- a/sd/inc/sdattr.hxx +++ b/sd/inc/sdattr.hxx @@ -32,9 +32,9 @@ #define _SDATTR_HXX #include -#include -#include -#include +#include +#include +#include #include #ifndef _SDATTR_HRC diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 7481759cff4c..e4122ca0d4c3 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -42,7 +42,7 @@ #include #include #include "sddllapi.h" -#include +#include #include #include #include diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx index d71d6371e1d1..794f23e94b8e 100644 --- a/sd/inc/sdundo.hxx +++ b/sd/inc/sdundo.hxx @@ -31,7 +31,7 @@ #ifndef _SD_SDUNDO_HXX #define _SD_SDUNDO_HXX -#include +#include #include "sddllapi.h" class SdDrawDocument; diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index ccd0619a4788..a00828a2690a 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -46,7 +46,7 @@ #include -#include +#include #include diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index f683492c2110..69ee48e58dd9 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 5ced88e66dfe..583c74b71109 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -32,7 +32,7 @@ #define _SD_UNDOMANAGER_HXX #include "misc/scopelock.hxx" -#include +#include namespace sd { diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx index 8d06ae3d0fcd..d5ffdd562a74 100644 --- a/sd/source/core/anminfo.cxx +++ b/sd/source/core/anminfo.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include -#include +#include #include "svx/xtable.hxx" #include -#include +#include #include #include diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index d8d6552c696c..c86296a90997 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -44,9 +44,6 @@ #include -#ifndef _OFA_MISCCFG_HXX -#include -#endif #include #include #include @@ -57,14 +54,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include @@ -262,7 +259,6 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh) } // DefTab und SpellOptions setzen - //OfaMiscCfg* pOfaMiscCfg = SFX_APP()->GetMiscConfig(); // Jetzt am Modul (SD) USHORT nDefTab = pOptions->GetDefTab(); SetDefaultTabulator( nDefTab ); diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx index 0513e1d02083..e208399d636f 100644 --- a/sd/source/core/drawdoc2.cxx +++ b/sd/source/core/drawdoc2.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 6beaee7082eb..9c44f9edc485 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -44,13 +44,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 413323d27e97..862c383f043b 100644 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -102,7 +102,7 @@ #include #include #include -#include +#include #include #include #include @@ -119,7 +119,7 @@ #include "shapelist.hxx" #include #include -#include +#include using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 58274ab3a009..99fbc31a2bb0 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #ifndef _SVX_SRIPTTYPEITEM_HXX diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 3f03640c27fb..047431bec461 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include @@ -60,7 +60,7 @@ // #90477# #include -#include +#include using namespace ::sd; using namespace ::com::sun::star; diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 9f6bc230359b..e90b55243726 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 708ed0b3c8b0..8c156af32038 100644 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -42,14 +42,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include #ifndef _SVX_EMPHITEM_HXX @@ -64,7 +64,7 @@ #include #include #include -#include +#include #define _SDR_POSITIVE #define _SDR_ITEMS @@ -78,7 +78,7 @@ #include "sdmod.hxx" #include "sdpage.hxx" #include "helpids.h" -#include +#include using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 04a8c36263ef..d80881304b17 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 7223cf193cbd..c3f69a675e10 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -43,13 +43,13 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include @@ -96,9 +96,9 @@ #include // #UndoRedo# -#include +#include -#include +#include #define CharSetItem SfxUInt16Item @@ -129,8 +129,8 @@ #define OfaStringListItem SfxStringListItem #define avmedia_MediaItem ::avmedia::MediaItem #include -#include -#include +#include +#include #include diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx index b843fd06009f..68719b132bb7 100644 --- a/sd/source/filter/cgm/sdcgmfilter.cxx +++ b/sd/source/filter/cgm/sdcgmfilter.cxx @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 75e5a4ba3227..eae3b2eadb40 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -46,7 +46,7 @@ #include #include #include -#include +#include //#ifndef _SVX_XIT_HXX //#include //#endif diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index b89c6238dcaa..e84d2b429ae3 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -75,9 +75,9 @@ #include #include #include -#include +#include #define _SVSTDARR_USHORTS -#include +#include //#ifndef _SVDETC_HXX //#include //#endif diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index d139940bfa97..2512c99e72d4 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "resltn.hxx" // enum PublishingResolution #include #include diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 7b0f8486f7bd..6d9860740740 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -44,14 +44,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 2ea34ab831e4..a1bbc3288962 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include @@ -44,11 +44,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -75,7 +75,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx index 3507a71526cf..657d658e22d0 100644 --- a/sd/source/filter/sdfilter.cxx +++ b/sd/source/filter/sdfilter.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "../ui/inc/DrawDocShell.hxx" #include "../ui/inc/strings.hrc" diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx index 16930a81b055..5fa918db31ef 100644 --- a/sd/source/filter/xml/sdtransform.cxx +++ b/sd/source/filter/xml/sdtransform.cxx @@ -32,10 +32,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index fa127ec752dd..6aac1c1c3967 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -70,8 +70,8 @@ #include // #80365# include necessary for XML progress bar at load time -#include -#include +#include +#include #include #include "sderror.hxx" diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index d339da99c96c..49ad473db0f0 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -45,10 +45,10 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index c285986452ca..2a7ca2df9b0d 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -57,11 +57,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 673e00477d46..b62bba0435ef 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -36,7 +36,7 @@ #ifndef _SV_SALBTYPE_HRC //autogen #include #endif -#include +#include #include "app.hxx" #include "optsitem.hxx" @@ -74,6 +74,10 @@ void SdOptionsItem::Commit() mrParent.Commit( *this ); }; +void SdOptionsItem::Notify( const com::sun::star::uno::Sequence& ) +{} + + // ----------------------------------------------------------------------------- Sequence< Any > SdOptionsItem::GetProperties( const Sequence< OUString >& rNames ) diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src index 4796be585d1e..77ef817e4c44 100644 --- a/sd/source/ui/app/res_bmp.src +++ b/sd/source/ui/app/res_bmp.src @@ -29,7 +29,7 @@ ************************************************************************/ #include -#include +#include #include "glob.hrc" #include "res_bmp.hrc" diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 9a331f8c73f2..49d52ad63cc3 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" #include -#include +#include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX #include #endif @@ -39,14 +39,14 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 8c6903d3bb7c..65485d9df447 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sd.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 410af582283a..0a4eaf0bbebe 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -33,9 +33,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -85,7 +85,7 @@ #include "sdabstdlg.hxx" #include "tpoption.hrc" #include "prntopts.hrc" -#include +#include /** retrieves the page that is currently painted. This will only be the master page if the current drawn view only shows the master page*/ diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx index dc4246d57888..274a99f830e5 100644 --- a/sd/source/ui/app/sdpopup.cxx +++ b/sd/source/ui/app/sdpopup.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index f22af4ad2887..7a57c81178b6 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -49,13 +49,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include //#ifndef _SVDETC_HXX //autogen diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx index e94fe501d73b..2f0bb6e4daea 100644 --- a/sd/source/ui/app/tbxww.cxx +++ b/sd/source/ui/app/tbxww.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #ifndef _SFX_IMAGEMGR_HXX #include diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx index ce7f1ff28acc..86f0e4db6e10 100644 --- a/sd/source/ui/app/tmplctrl.cxx +++ b/sd/source/ui/app/tmplctrl.cxx @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include #include #include "tmplctrl.hxx" diff --git a/sd/source/ui/dlg/LayerDialogContent.cxx b/sd/source/ui/dlg/LayerDialogContent.cxx index ac3149d4cadf..735af8c95042 100644 --- a/sd/source/ui/dlg/LayerDialogContent.cxx +++ b/sd/source/ui/dlg/LayerDialogContent.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 0c05c58312b8..d74052a7ec3c 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/celltempl.cxx b/sd/source/ui/dlg/celltempl.cxx index 0acea6b8d033..b0a353c42b2f 100644 --- a/sd/source/ui/dlg/celltempl.cxx +++ b/sd/source/ui/dlg/celltempl.cxx @@ -35,8 +35,8 @@ #undef SD_DLLIMPLEMENTATION #endif -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 84259a54f66b..ea89fba79500 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "DrawDocShell.hxx" #include #include diff --git a/sd/source/ui/dlg/dlgassim.hxx b/sd/source/ui/dlg/dlgassim.hxx index 33b3a777b68b..d4a75fb8dd3d 100644 --- a/sd/source/ui/dlg/dlgassim.hxx +++ b/sd/source/ui/dlg/dlgassim.hxx @@ -28,7 +28,7 @@ * ************************************************************************/ -#include +#include #include "drawdoc.hxx" #include #include diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx index 6cee99175fcc..254e3f6dcfa2 100644 --- a/sd/source/ui/dlg/dlgchar.cxx +++ b/sd/source/ui/dlg/dlgchar.cxx @@ -44,7 +44,7 @@ #include "sdresid.hxx" #include "dlg_char.hxx" #include -#include +#include /************************************************************************* |* diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 7ec89ac9a000..19fb96a6e4d9 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -40,10 +40,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index a7988b850214..dbe0e252f7eb 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -48,11 +48,11 @@ #include #include -#include +#include #include #include "View.hxx" #include -#include +#include #include #ifndef _SD_SDRESID_HXX @@ -64,7 +64,7 @@ #include "bulmaper.hxx" #include "DrawDocShell.hxx" #include -#include +#include namespace sd { diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index bf5eb5da7c39..2145e477e476 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -35,7 +35,7 @@ #undef SD_DLLIMPLEMENTATION #endif -#include +#include #ifndef _SVX_DIALOGS_HRC #include #endif @@ -48,7 +48,7 @@ #include "dlgpage.hxx" #include "DrawDocShell.hxx" -#include +#include #include #include diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 5a232649251e..fc541e7925e8 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include #include "dlgsnap.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index 1fea04cf31ab..a4f4e99d2463 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/layeroptionsdlg.cxx b/sd/source/ui/dlg/layeroptionsdlg.cxx index cb9ade5336f8..3414f779cad8 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.cxx +++ b/sd/source/ui/dlg/layeroptionsdlg.cxx @@ -34,7 +34,7 @@ #ifdef SD_DLLIMPLEMENTATION #undef SD_DLLIMPLEMENTATION #endif -#include +#include #include "strings.hrc" #include "sdattr.hxx" diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 6d34834ccab9..f43472d58ace 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include namespace sd { diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index fa31c7fbb209..b1f97ea29051 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -36,11 +36,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 2ebdf316af34..eeefcda29f3d 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx index d881c45070d3..e624e3b23320 100644 --- a/sd/source/ui/dlg/present.cxx +++ b/sd/source/ui/dlg/present.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include "sdattr.hxx" #include "present.hxx" diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx index 748d34a94c6c..b7a65b0d5b6e 100644 --- a/sd/source/ui/dlg/prltempl.cxx +++ b/sd/source/ui/dlg/prltempl.cxx @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "DrawDocShell.hxx" #include "glob.hrc" @@ -59,7 +59,7 @@ #include "enumdlg.hrc" //#include "enumdlg.hxx" #include "bulmaper.hxx" -#include +#include #include #include #include "drawdoc.hxx" diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 225919f32280..6a74ffaf206f 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -42,7 +42,7 @@ #include "sdresid.hxx" #include "prntopts.hxx" #include "app.hrc" -#include +#include #include // STATIC DATA ----------------------------------------------------------- diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index b57474906567..1f97ce8d4cf2 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -36,7 +36,7 @@ #endif -#include +#include #include #include diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 9d335b859e31..bd93b07beb9a 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx index 98a4959abdb8..5ce27def13a6 100644 --- a/sd/source/ui/dlg/tabtempl.cxx +++ b/sd/source/ui/dlg/tabtempl.cxx @@ -40,18 +40,18 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include "DrawDocShell.hxx" diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d6e379ce50fc..80ba0b78c9f9 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -57,7 +57,7 @@ #include #include #include -#include +#include #include #include #include @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include "View.hxx" diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index b22ad4e32dbd..102c95a9b3e5 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -58,7 +58,7 @@ #include "tpoption.hxx" #include "strings.hrc" #include "app.hrc" -#include +#include #include #define DLGWIN this->GetParent()->GetParent() diff --git a/sd/source/ui/dlg/unchss.cxx b/sd/source/ui/dlg/unchss.cxx index dc0ea3d63827..e42012d4b75d 100644 --- a/sd/source/ui/dlg/unchss.cxx +++ b/sd/source/ui/dlg/unchss.cxx @@ -32,9 +32,9 @@ #include "precompiled_sd.hxx" -#include -#include -#include +#include +#include +#include #include #include "unchss.hxx" diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index c62bc9fcc620..96461168e299 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -51,7 +51,7 @@ #include #endif #include -#include +#include #include #include #include diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 37045e9d0731..3d2ea5ace652 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -41,8 +41,8 @@ #endif #include #include -#include -#include +#include +#include #include #include #include @@ -50,7 +50,7 @@ #include #endif #include -#include +#include #include #include #ifndef _SFX_ECODE_HXX //autogen diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index f9381d08a219..d9e5f43535ef 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include #include #ifndef _SFX_DOCFILE_HXX //autogen #include @@ -55,16 +55,16 @@ #include #include #include -#include -#include +#include +#include #include #include #ifndef _SO_CLSIDS_HXX #include #endif #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/docshell/formatclipboard.cxx b/sd/source/ui/docshell/formatclipboard.cxx index 8035e78150c7..ba4fb8efae99 100644 --- a/sd/source/ui/docshell/formatclipboard.cxx +++ b/sd/source/ui/docshell/formatclipboard.cxx @@ -35,10 +35,10 @@ #include // header for class SfxItemIter -#include +#include // header for class SfxStyleSheet -#include +#include /*-------------------------------------------------------------------- --------------------------------------------------------------------*/ diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index d0d6938a2b21..4ce1bfebf6ee 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -45,7 +45,7 @@ #include "app.hrc" #include #include -#include +#include #include #include diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 3abd76237680..95687ab8a833 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -54,8 +54,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index 5bb4942b8ea5..c3071461c7e3 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 64fb3783d78d..fac03893a880 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -38,7 +38,7 @@ #include #endif #include -#include +#include #include #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" @@ -49,8 +49,8 @@ #include #include #include -#include -#include +#include +#include #ifdef IRIX #include diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index e9654a21bcee..eb738ef0d2fa 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index 238c047ef70c..de658c401428 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index ff95b7b3115b..1e16ac4c332c 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -34,9 +34,9 @@ #include #include "fuconbez.hxx" -#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index a360effd5469..a9f1445097e4 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -40,7 +40,7 @@ #include #include "app.hrc" -#include +#include #include #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include @@ -73,7 +73,7 @@ // #109583# #include #include -#include +#include #include #include "sdresid.hxx" diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index a36b6f508534..d9513f4b5c22 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -40,7 +40,7 @@ #include #include "app.hrc" -#include +#include #include #include #include @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 3f9d8151ef4e..28531c7bef47 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -34,7 +34,7 @@ #include "fuconstr.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index ef98942a581f..512ccdb53623 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -32,11 +32,11 @@ #include "precompiled_sd.hxx" #include "fuconuno.hxx" -#include +#include #include #include #include -#include +#include #include diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 6c6c0c3aaa81..7da8b98ea568 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -76,7 +76,7 @@ #include "sdresid.hxx" #include "drawview.hxx" #include "fusel.hxx" -#include +#include #include #include "slideshow.hxx" #include diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index d23493de4249..24ed231ea25b 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "fuediglu.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 0babfc9c2d38..42576f8d9d53 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index dfff1da8207e..578830b37c25 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -44,12 +44,12 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include #include @@ -64,7 +64,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index 0dea41e10ca9..a6dad3779ab7 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -38,7 +38,7 @@ #ifndef _EDITENG_HXX #include #endif -#include +#include #include #include #include @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 8e7d6c6b5b86..0ad0d84f19a5 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 694f1ae6615a..5083023efdde 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -46,7 +46,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include "svx/xtable.hxx" #include "strings.hrc" diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 29bc28e91e17..a16e6dbb20dd 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -34,11 +34,11 @@ #include "fuolbull.hxx" #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 10653e514697..284b4da2be66 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -40,14 +40,14 @@ #include #include -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif #include -#include +#include #include -#include +#include #include #ifndef _SVX_SVDORECT_HXX #include @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index c6b8f9feaab2..936802ff34cb 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -35,7 +35,7 @@ #include "fupoor.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 6975aa66fba9..7fd48732ccc4 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -35,8 +35,8 @@ #include "fuprlout.hxx" #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index b1d43699e27b..d4f6dc71cc88 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -36,9 +36,9 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include -#include +#include #include "app.hrc" diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 4e91ef79dc9a..fe97b7410ee7 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -40,15 +40,15 @@ #include #include "drawview.hxx" #include -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index 6b79046a9bf8..b10f539cf29e 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -33,7 +33,7 @@ #include "fusldlg.hxx" -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 28bb58538d85..9f0214668f82 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "fusnapln.hxx" -#include +#include #include #include diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index d9ebadd48ac7..e53d6d9d7789 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -42,7 +42,7 @@ #include #include // fuer SID_OBJECT_SELECT #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 86cfb6be3a77..0f94366f1c56 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -39,14 +39,14 @@ #include #include #include -#include -#include +#include +#include #include #ifndef _SVDOGROUP_HXX //autogen #include #endif #include -#include +#include #include #include #include diff --git a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx index abe492991067..e408b70b755a 100644 --- a/sd/source/ui/inc/AccessibleOutlineEditSource.hxx +++ b/sd/source/ui/inc/AccessibleOutlineEditSource.hxx @@ -33,8 +33,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/inc/EventMultiplexer.hxx b/sd/source/ui/inc/EventMultiplexer.hxx index 79e33452959c..5627612aec06 100644 --- a/sd/source/ui/inc/EventMultiplexer.hxx +++ b/sd/source/ui/inc/EventMultiplexer.hxx @@ -31,7 +31,7 @@ #ifndef SD_TOOLS_EVENT_MULTIPLEXER_HXX #define SD_TOOLS_EVENT_MULTIPLEXER_HXX -#include +#include #include #include diff --git a/sd/source/ui/inc/FormShellManager.hxx b/sd/source/ui/inc/FormShellManager.hxx index c919e5f95c91..9956d8dc2af9 100644 --- a/sd/source/ui/inc/FormShellManager.hxx +++ b/sd/source/ui/inc/FormShellManager.hxx @@ -34,7 +34,7 @@ #include #include -#include +#include class VclWindowEvent; class FmFormShell; diff --git a/sd/source/ui/inc/PreviewRenderer.hxx b/sd/source/ui/inc/PreviewRenderer.hxx index c508410045aa..7211a02da6f4 100644 --- a/sd/source/ui/inc/PreviewRenderer.hxx +++ b/sd/source/ui/inc/PreviewRenderer.hxx @@ -34,7 +34,7 @@ #include "drawview.hxx" #include #include -#include +#include #include diff --git a/sd/source/ui/inc/ViewShellHint.hxx b/sd/source/ui/inc/ViewShellHint.hxx index 23ff29c7f8de..493d2c2e2a19 100644 --- a/sd/source/ui/inc/ViewShellHint.hxx +++ b/sd/source/ui/inc/ViewShellHint.hxx @@ -31,7 +31,7 @@ #ifndef SD_VIEW_SHELL_HINT_HXX #define SD_VIEW_SHELL_HINT_HXX -#include +#include namespace sd { diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 7b61c37adb45..a6c37a54991a 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -31,8 +31,8 @@ #ifndef SD_OUTPUT_DEVICE_UPDATER_HXX #define SD_OUTPUT_DEVICE_UPDATER_HXX -#include -#include +#include +#include #include "sddllapi.h" #ifndef INCLUDED_VECTOR @@ -65,7 +65,7 @@ class ViewShell; this document is reformatted when the monitored option changes.

*/ class SD_DLLPUBLIC WindowUpdater - : public SfxListener + : public utl::ConfigurationListener { public: explicit WindowUpdater (void); @@ -116,7 +116,7 @@ public: /** Callback that waits for notifications of a SvtCTLOptions object. */ - virtual void Notify (SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster*, sal_uInt32 nHint); private: /// Options to monitor for changes. diff --git a/sd/source/ui/inc/diactrl.hxx b/sd/source/ui/inc/diactrl.hxx index b6e1b2dc9fbd..df235a66c71d 100644 --- a/sd/source/ui/inc/diactrl.hxx +++ b/sd/source/ui/inc/diactrl.hxx @@ -32,7 +32,7 @@ #define _SD_DIACTRL_HXX #include "dlgctrls.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/inc/docprev.hxx b/sd/source/ui/inc/docprev.hxx index 746df06794ea..80f219ddfc59 100644 --- a/sd/source/ui/inc/docprev.hxx +++ b/sd/source/ui/inc/docprev.hxx @@ -37,7 +37,7 @@ #include -#include +#include #include #include "fadedef.h" #include "sddllapi.h" diff --git a/sd/source/ui/inc/formatclipboard.hxx b/sd/source/ui/inc/formatclipboard.hxx index 67f77e2a406b..cd8d3b801bf8 100644 --- a/sd/source/ui/inc/formatclipboard.hxx +++ b/sd/source/ui/inc/formatclipboard.hxx @@ -33,7 +33,7 @@ #include "View.hxx" // header for class SfxItemSet -#include +#include //----------------------------------------------------------------------------- /** This class acts as data container and execution class for the format paintbrush feature in draw and impress. diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx index c5feb07dcab6..49e98cd36e73 100644 --- a/sd/source/ui/inc/fuconuno.hxx +++ b/sd/source/ui/inc/fuconuno.hxx @@ -31,7 +31,7 @@ #ifndef SD_FU_CONSTRUCT_UNO_CONTROL_HXX #define SD_FU_CONSTRUCT_UNO_CONTROL_HXX -#include +#include #include "fuconstr.hxx" namespace sd { diff --git a/sd/source/ui/inc/fuformatpaintbrush.hxx b/sd/source/ui/inc/fuformatpaintbrush.hxx index 44b6548b50ce..223b766296c5 100644 --- a/sd/source/ui/inc/fuformatpaintbrush.hxx +++ b/sd/source/ui/inc/fuformatpaintbrush.hxx @@ -34,7 +34,7 @@ #include "fupoor.hxx" // header for class SfxItemSet -#include +#include namespace sd { diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index a67c91948617..a69381d784df 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -85,6 +85,7 @@ public: virtual ~SdOptionsItem(); virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence& aPropertyNames); ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames ); diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 4fc2c12ad71b..182d2f68ac54 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -40,7 +40,7 @@ #include "sddllapi.h" #include #include -#include +#include #include #include "sdxfer.hxx" diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 6ad9be896829..59a3a192907b 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include // ------------------ // - SdTransferable - diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index a29397a363af..a4dc305d6aeb 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -52,7 +52,7 @@ #include -#include +#include #include #include diff --git a/sd/source/ui/notes/EditWindow.cxx b/sd/source/ui/notes/EditWindow.cxx index 89c45decd123..10c4b58fd999 100755 --- a/sd/source/ui/notes/EditWindow.cxx +++ b/sd/source/ui/notes/EditWindow.cxx @@ -41,7 +41,7 @@ #include #include #include "sdresid.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 2fc4245269ec..8890c608f17f 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 911d31d2518f..3fad355c915a 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -35,7 +35,7 @@ #include "showwindow.hxx" -#include +#include #include diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 6d5e3e31ad80..f1cb2cf4afb9 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index c0b4857f3f6b..a3d117322e84 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -46,8 +46,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index f91c7337713a..6ace8ebdd370 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index ba8dbb278ca4..a23c1d09a9e0 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -88,10 +88,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 3cd696e4bb26..e877b41d3738 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -60,7 +60,7 @@ #include "sdresid.hxx" #include "glob.hrc" -#include +#include #include #include #include @@ -72,10 +72,10 @@ #include #include #include -#include +#include #ifndef _SFXITEMPOOL_HXX -#include +#include #endif using namespace std; diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 11cfdbb65ef0..b2adb8cc040e 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -50,7 +50,7 @@ #include //#include -#include +#include #include #include diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index e2f923424831..1d1d38df82bf 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -57,12 +57,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include "framework/FrameworkHelper.hxx" #include "app.hrc" diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 2eaf13ea470f..abae004cb73a 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -39,8 +39,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 7a39f1c42f15..e769d4b5180d 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -61,7 +61,7 @@ #include #include "sdresid.hxx" #include -#include +#include #include #include "taskpane/TitledControl.hxx" #include diff --git a/sd/source/ui/toolpanel/TitleBar.cxx b/sd/source/ui/toolpanel/TitleBar.cxx index c4dd6537c9ce..c0e605cac79e 100644 --- a/sd/source/ui/toolpanel/TitleBar.cxx +++ b/sd/source/ui/toolpanel/TitleBar.cxx @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx index 03795e0e2d71..f78bbdfa0308 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.cxx @@ -60,8 +60,8 @@ #include "DrawDocShell.hxx" #include "drawdoc.hxx" #include "sdpage.hxx" -#include -#include +#include +#include #include "sdresid.hxx" #include "tools/TimerBasedTaskExecution.hxx" #include "pres.hxx" diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx index 7e0c3b2887c0..cf0992596c64 100644 --- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 9356dac3f7f9..9b419c9924ec 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -62,12 +62,12 @@ #include "drawview.hxx" #endif #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include #include @@ -76,7 +76,7 @@ #include "stlpool.hxx" #include "unmovss.hxx" #include -#include +#include using namespace ::sd::toolpanel::controls; #define MasterPagesSelector diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 60968fa9a51c..a59b63a3df10 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -63,10 +63,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index a1a8a4f4dabb..5fedbcd717b3 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index a252e2302b59..dbf0e8a424a5 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -54,7 +54,7 @@ #ifndef _SVX_SVXIDS_HRC #include #endif -#include +#include #include #include #include @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/unoidl/unopage.hxx b/sd/source/ui/unoidl/unopage.hxx index a1d9e0436e98..5d4c76bd9e82 100644 --- a/sd/source/ui/unoidl/unopage.hxx +++ b/sd/source/ui/unoidl/unopage.hxx @@ -39,7 +39,7 @@ #include #include -#include +#include #ifndef _SVX_UNOPAGE_HXX #include diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index 0808221582f1..5150afb2d10f 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx index 9e34bc4e3f39..32f5de8594ba 100644 --- a/sd/source/ui/view/GraphicObjectBar.cxx +++ b/sd/source/ui/view/GraphicObjectBar.cxx @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx index c05c55c0d6de..510d4a6fccca 100644 --- a/sd/source/ui/view/MediaObjectBar.cxx +++ b/sd/source/ui/view/MediaObjectBar.cxx @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/sd/source/ui/view/PrintManager.cxx b/sd/source/ui/view/PrintManager.cxx index 797518473ebd..3963c4cb5273 100644 --- a/sd/source/ui/view/PrintManager.cxx +++ b/sd/source/ui/view/PrintManager.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include "WindowUpdater.hxx" @@ -71,7 +71,7 @@ #include "printdlg.hrc" #include "prntopts.hrc" #include "app.hrc" -#include +#include #include #include #include "printdialog.hxx" @@ -368,7 +368,7 @@ USHORT PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p if( pPrintOpts ) { - SfxMiscCfg* pMisc = SFX_APP()->GetMiscConfig(); + ::utl::MiscCfg aMisc; if( pPrintOpts->GetOptionsPrint().IsDate() ) { @@ -398,9 +398,9 @@ USHORT PrintManager::Print (SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* p ePageKind = PK_NOTES; } - pPrintOpts->GetOptionsPrint().SetWarningPrinter( pMisc->IsNotFoundWarning() ); - pPrintOpts->GetOptionsPrint().SetWarningSize( pMisc->IsPaperSizeWarning() ); - pPrintOpts->GetOptionsPrint().SetWarningOrientation( pMisc->IsPaperOrientationWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningPrinter( aMisc.IsNotFoundWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningSize( aMisc.IsPaperSizeWarning() ); + pPrintOpts->GetOptionsPrint().SetWarningOrientation( aMisc.IsPaperOrientationWarning() ); UINT16 nQuality = pPrintOpts->GetOptionsPrint().GetOutputQuality(); ULONG nMode = DRAWMODE_DEFAULT; diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx index 286132c304c0..487794816270 100644 --- a/sd/source/ui/view/ToolBarManager.cxx +++ b/sd/source/ui/view/ToolBarManager.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index 25fca9e0bae7..2bcddeb6aaef 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -83,7 +83,7 @@ #include #include #include -#include +#include #include #include "fubullet.hxx" diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 3afef14deeed..75b728c7849b 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/WindowUpdater.cxx b/sd/source/ui/view/WindowUpdater.cxx index 64e93aee785e..135c6974f64e 100644 --- a/sd/source/ui/view/WindowUpdater.cxx +++ b/sd/source/ui/view/WindowUpdater.cxx @@ -42,7 +42,7 @@ #endif #include #include -#include +#include #include @@ -52,7 +52,7 @@ WindowUpdater::WindowUpdater (void) : mpViewShell (NULL), mpDocument (NULL) { - StartListening (maCTLOptions); + maCTLOptions.AddListener(this); } @@ -60,7 +60,7 @@ WindowUpdater::WindowUpdater (void) WindowUpdater::~WindowUpdater (void) throw () { - EndListening (maCTLOptions); + maCTLOptions.RemoveListener(this); } @@ -163,33 +163,29 @@ void WindowUpdater::UpdateWindow (OutputDevice* pDevice) const -void WindowUpdater::Notify (SfxBroadcaster&, const SfxHint& rHint) +void WindowUpdater::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { - const SfxSimpleHint& rSimpleHint = static_cast(rHint); - if (rSimpleHint.GetId() == SFX_HINT_CTL_SETTINGS_CHANGED) - { - // #110094#-7 - // Clear the master page cache so that master pages will be redrawn. - //if (mpViewShell != NULL) - //{ - // SdView* pView = mpViewShell->GetView(); - // if (pView != NULL) - // pView->ReleaseMasterPagePaintCache (); - //} - // Set the current state at all registered output devices. - tWindowList::iterator aWindowIterator (maWindowList.begin()); - while (aWindowIterator != maWindowList.end()) - Update (*aWindowIterator++); - - // Reformat the document for the modified state to take effect. - if (mpDocument != NULL) - mpDocument->ReformatAllTextObjects(); - - // Invalidate the windows to make the modified state visible. - aWindowIterator = maWindowList.begin(); - while (aWindowIterator != maWindowList.end()) - (*aWindowIterator++)->Invalidate(); - } + // #110094#-7 + // Clear the master page cache so that master pages will be redrawn. + //if (mpViewShell != NULL) + //{ + // SdView* pView = mpViewShell->GetView(); + // if (pView != NULL) + // pView->ReleaseMasterPagePaintCache (); + //} + // Set the current state at all registered output devices. + tWindowList::iterator aWindowIterator (maWindowList.begin()); + while (aWindowIterator != maWindowList.end()) + Update (*aWindowIterator++); + + // Reformat the document for the modified state to take effect. + if (mpDocument != NULL) + mpDocument->ReformatAllTextObjects(); + + // Invalidate the windows to make the modified state visible. + aWindowIterator = maWindowList.begin(); + while (aWindowIterator != maWindowList.end()) + (*aWindowIterator++)->Invalidate(); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 45a22dd9f56b..dfbd76e4a3b6 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -36,7 +36,7 @@ #endif #include #include -#include +#include #include #ifndef _VIEW3D_HXX //autogen #include @@ -48,12 +48,12 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx index a638af2638c3..463c7415e853 100644 --- a/sd/source/ui/view/drbezob.cxx +++ b/sd/source/ui/view/drbezob.cxx @@ -39,10 +39,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index 55980ff02050..5a2b458341c9 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -39,14 +39,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index 9c2733c933dd..2a29ecbc6d6c 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -46,9 +46,9 @@ #endif #include #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -65,14 +65,14 @@ #include #include #include -#include +#include #ifndef _SVX_SRIPTTYPEITEM_HXX //autogen #include #endif #include #include #include -#include +#include #include "app.hrc" diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 27d5f6202369..812bfca1a83d 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 87374cce8c04..54e0f37a1b19 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -51,13 +51,13 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 85706fb9cbb6..52a0a2e6b3cb 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -35,7 +35,7 @@ #include "DrawViewShell.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 91136028fd4d..cfe52759033a 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -46,11 +46,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -58,11 +58,11 @@ #include // #UndoRedo# -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index b5644418fdf2..0e39b4a82b33 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -47,10 +47,10 @@ #ifndef _SFX_DISPATCH_HXX //autogen #include #endif -#include +#include #include #include -#include +#include #ifndef _SVXIDS_HXX #include #endif @@ -60,7 +60,7 @@ #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 3c396db7207d..2eb4282bb6e5 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -42,14 +42,14 @@ #include #endif #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #ifndef _SVX_DIALOGS_HRC #include diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index d8dbc451f0c3..3581fde618a7 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -53,7 +53,7 @@ #endif #include #include -#include +#include #include #include #include "stlsheet.hxx" diff --git a/sd/source/ui/view/drviewsd.cxx b/sd/source/ui/view/drviewsd.cxx index 9838f185807f..0d90619ff76a 100644 --- a/sd/source/ui/view/drviewsd.cxx +++ b/sd/source/ui/view/drviewsd.cxx @@ -36,10 +36,10 @@ #ifndef _SVXIDS_HRC #include #endif -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx index 0b3ecf1af6e7..f722f1b56477 100644 --- a/sd/source/ui/view/drviewse.cxx +++ b/sd/source/ui/view/drviewse.cxx @@ -40,10 +40,10 @@ #include "undo/undomanager.hxx" #include -#include +#include #include #include -#include +#include #include #include #include @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include @@ -64,11 +64,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx index 2b1b7518666c..3783f20a49ef 100644 --- a/sd/source/ui/view/drviewsf.cxx +++ b/sd/source/ui/view/drviewsf.cxx @@ -47,9 +47,9 @@ #include #endif #include -#include -#include -#include +#include +#include +#include #include #ifndef _BINDING_HXX //autogen #include @@ -63,7 +63,7 @@ #include #include #include -#include +#include #ifndef SD_FRAME_VIEW #include "FrameView.hxx" diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index f4fa1d027fd9..7952106e34e0 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -32,8 +32,8 @@ #include "precompiled_sd.hxx" #include "DrawViewShell.hxx" -#include -#include +#include +#include #include #ifndef _SVXIDS_HRC #include diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index 703677d05415..4eb0b6671d82 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -34,7 +34,7 @@ #include "DrawViewShell.hxx" #include #include "sdattr.hxx" -#include +#include #include #include #include diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx index cdc5fac18912..c21432b27846 100644 --- a/sd/source/ui/view/drviewsj.cxx +++ b/sd/source/ui/view/drviewsj.cxx @@ -33,7 +33,7 @@ #include "DrawViewShell.hxx" #include -#include +#include #ifndef _SVXIDS_HRC //autogen #include #endif diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 6b078c5f28cc..468ea50776f2 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #ifndef _ZOOMITEM_HXX //autogen #include #endif diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index d14f6ed9dc34..43a8683cd039 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -55,9 +55,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index 1e5564427ac8..c500a95f2811 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -46,11 +46,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 52e098caf7f3..8fc564c358f6 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -32,7 +32,7 @@ #include "precompiled_sd.hxx" #include "Ruler.hxx" -#include +#include #include #ifndef _SVXIDS_HXX //autogen #include diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 0a17724df1ed..49a5639980ff 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -52,8 +52,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 1e9e39383bec..cbc8758d2b53 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -40,7 +40,7 @@ #ifndef _EDITDATA_HXX #include #endif -#include +#include #include #include #include @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #ifndef _FM_FMMODEL_HXX #include diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 72534b476a73..9d301368418c 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 38e2b6b88001..86e441939b0e 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -59,11 +59,10 @@ #include #include #include -#include #include #include -#include -#include +#include +#include #include #include #include @@ -92,7 +91,7 @@ #include #endif #include -#include +#include #include using namespace ::com::sun::star; diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 208d5426c8bd..7effb79a00b1 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -48,7 +48,7 @@ #ifndef _SCRBAR_HXX //autogen #include #endif -#include +#include #include #ifndef _SVXIDS_HXX #include @@ -90,7 +90,7 @@ #include // #96090# -#include +#include #include #include "SpellDialogChildWindow.hxx" -- cgit From 6301be9e1ad4b359edd3c900acd36f3552761579 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Oct 2009 13:22:39 +0200 Subject: #i103496#: move some fontsubstitution stuff from vcl to unotools to get xmloff vcl free --- sd/inc/pch/precompiled_sd.hxx | 2 +- sd/source/filter/eppt/eppt.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 1c236c9b290e..8250e050bcf4 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -862,7 +862,7 @@ #include "vcl/field.hxx" #include "vcl/fixed.hxx" #include "vcl/font.hxx" -#include "vcl/fontcvt.hxx" +#include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" #include "vcl/gfxlink.hxx" #include "vcl/gradient.hxx" diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index 84b64e33157c..c4a55b5c4369 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include "pptexanimations.hxx" #include -- cgit From 43cef38dfeea51d2058dcc5e18cfab8c05329c9d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 31 Oct 2009 00:29:04 +0100 Subject: #i106421#: move msfilter to filter --- sd/source/filter/eppt/eppt.cxx | 40 +++++++++++++++++++++++++++++-- sd/source/filter/eppt/eppt.hxx | 2 +- sd/source/filter/eppt/escherex.hxx | 2 +- sd/source/filter/eppt/pptexanimations.hxx | 2 +- sd/source/filter/ppt/pptatom.hxx | 1 + sd/source/filter/ppt/pptin.cxx | 2 +- sd/source/filter/ppt/pptin.hxx | 4 ++-- sd/source/filter/ppt/pptinanimations.hxx | 4 +--- sd/source/filter/sdpptwrp.cxx | 38 ++++++++--------------------- sd/source/ui/docshell/docshel4.cxx | 2 +- sd/util/makefile.mk | 2 +- sd/util/sdfilt.map | 2 +- 12 files changed, 59 insertions(+), 42 deletions(-) (limited to 'sd') diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index cb31e99aec63..197a977c78a8 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -58,10 +58,11 @@ #include #include #include -#include +#include #include #include -#include +#include +#include #include #include @@ -2580,3 +2581,38 @@ extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI ExportPPT( SvStorageRef& rS return bStatus; } +extern "C" SAL_DLLPUBLIC_EXPORT BOOL __LOADONCALLAPI SaveVBA( SfxObjectShell& rDocShell, SvMemoryStream*& pBas ) +{ + SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); + SvxImportMSVBasic aMSVBas( rDocShell, *xDest, FALSE, FALSE ); + aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + + SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + { + SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); + if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + { + SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); + if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) + { + UINT32 nLen = xTemp->GetSize(); + if ( nLen ) + { + char* pTemp = new char[ nLen ]; + if ( pTemp ) + { + xTemp->Seek( STREAM_SEEK_TO_BEGIN ); + xTemp->Read( pTemp, nLen ); + pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); + pBas->ObjectOwnsMemory( TRUE ); + return TRUE; + } + } + } + } + } + + return FALSE; +} + diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index c4a55b5c4369..b4d6fdf79559 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -85,7 +85,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/eppt/escherex.hxx b/sd/source/filter/eppt/escherex.hxx index 1ebebe8a5504..577531d9f534 100644 --- a/sd/source/filter/eppt/escherex.hxx +++ b/sd/source/filter/eppt/escherex.hxx @@ -30,7 +30,7 @@ #ifndef _PptEscherEX_HXX #define _PptEscherEX_HXX -#include +#include // --------------------------------------------------------------------------------------------- // Werte fuer den ULONG im PPT_PST_TextHeaderAtom diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 78dbb731ef0b..effbe3381cea 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -38,7 +38,7 @@ #include "../ppt/pptanimations.hxx" #endif #include -#include +#include #ifdef DBG_ANIM_LOG #include diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx index 9ccd845d14e6..14a7f81b4e98 100644 --- a/sd/source/filter/ppt/pptatom.hxx +++ b/sd/source/filter/ppt/pptatom.hxx @@ -32,6 +32,7 @@ #define _PPTATOM_HXX_ #include +#include class SvStream; diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index ae347eeaba12..37277a17c97b 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx index 59d59eece151..0549f8fa85c0 100644 --- a/sd/source/filter/ppt/pptin.hxx +++ b/sd/source/filter/ppt/pptin.hxx @@ -31,11 +31,11 @@ #ifndef _SD_PPTIN_HXX #define _SD_PPTIN_HXX -#include +#include #include #include #include -#include +#include #include #include diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 114f471a3cef..e53a2c406f36 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -34,15 +34,13 @@ #include #include -#ifndef _SD_PPTANIMATIONS_HXX #include "pptanimations.hxx" -#endif #include #ifdef DBG_ANIM_LOG #include #endif -#include +#include #include diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx index bc4a63012caa..8dea30f1659a 100644 --- a/sd/source/filter/sdpptwrp.cxx +++ b/sd/source/filter/sdpptwrp.cxx @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -43,7 +43,7 @@ #include "ppt/pptin.hxx" #include "drawdoc.hxx" #include -#include +#include // -------------- // - Namespaces - @@ -54,7 +54,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::task; using namespace ::com::sun::star::frame; - typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, Reference< XModel > &, Reference< XStatusIndicator > &, @@ -63,6 +62,8 @@ typedef BOOL ( __LOADONCALLAPI *ExportPPT )( SvStorageRef&, typedef sal_Bool ( SAL_CALL *ImportPPT )( const ::rtl::OUString&, Sequence< PropertyValue >*, SdDrawDocument*, SvStream&, SvStorage&, SfxMedium& ); +typedef BOOL ( __LOADONCALLAPI *SaveVBA )( SfxObjectShell&, SvMemoryStream*& ); + // --------------- // - SdPPTFilter - // --------------- @@ -188,32 +189,13 @@ void SdPPTFilter::PreSaveBasic() SvtFilterOptions* pFilterOptions = SvtFilterOptions::Get(); if( pFilterOptions && pFilterOptions->IsLoadPPointBasicStorage() ) { - SvStorageRef xDest( new SvStorage( new SvMemoryStream(), TRUE ) ); - SvxImportMSVBasic aMSVBas( (SfxObjectShell&) mrDocShell, *xDest, FALSE, FALSE ); - aMSVBas.SaveOrDelMSVBAStorage( TRUE, String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - - SvStorageRef xOverhead = xDest->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - if ( xOverhead.Is() && ( xOverhead->GetError() == SVSTREAM_OK ) ) + ::osl::Module* pLibrary = OpenLibrary( mrMedium.GetFilter()->GetUserData() ); + if( pLibrary ) { - SvStorageRef xOverhead2 = xOverhead->OpenSotStorage( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead") ) ); - if ( xOverhead2.Is() && ( xOverhead2->GetError() == SVSTREAM_OK ) ) + SaveVBA pSaveVBA= reinterpret_cast(pLibrary->getFunctionSymbol( ::rtl::OUString::createFromAscii("SaveVBA") )); + if( pSaveVBA ) { - SvStorageStreamRef xTemp = xOverhead2->OpenSotStream( String( RTL_CONSTASCII_USTRINGPARAM("_MS_VBA_Overhead2") ) ); - if ( xTemp.Is() && ( xTemp->GetError() == SVSTREAM_OK ) ) - { - UINT32 nLen = xTemp->GetSize(); - if ( nLen ) - { - char* pTemp = new char[ nLen ]; - if ( pTemp ) - { - xTemp->Seek( STREAM_SEEK_TO_BEGIN ); - xTemp->Read( pTemp, nLen ); - pBas = new SvMemoryStream( pTemp, nLen, STREAM_READ ); - pBas->ObjectOwnsMemory( TRUE ); - } - } - } + pSaveVBA( (SfxObjectShell&) mrDocShell, pBas ); } } } diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx index 3d2ea5ace652..ce2c38f20afd 100644 --- a/sd/source/ui/docshell/docshel4.cxx +++ b/sd/source/ui/docshell/docshel4.cxx @@ -66,7 +66,7 @@ #include #include #include -#include +//#include #include #include #include diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index e530511ee565..6b1e6ebf1676 100644 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -250,7 +250,7 @@ DEF5NAME=$(SHL5TARGET) SHL5STDLIBS = $(ISDLIB) \ $(SVXCORELIB) \ - $(SVXMSFILTERLIB) \ + $(MSFILTERLIB) \ $(SFX2LIB) \ $(SVTOOLLIB) \ $(SOTLIB) \ diff --git a/sd/util/sdfilt.map b/sd/util/sdfilt.map index ac6b782f3145..62213393408d 100644 --- a/sd/util/sdfilt.map +++ b/sd/util/sdfilt.map @@ -2,7 +2,7 @@ PPTEXPORTER_1_0 { global: ExportPPT; ImportPPT; - + SaveVBA; local: *; }; -- cgit From 18552793d3b3f1a77e75de9d1f50921eba8f232e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 2 Nov 2009 20:49:14 +0100 Subject: #i106421#: create new cui resource file --- sd/source/ui/docshell/docshel2.cxx | 2 +- sd/source/ui/func/fuarea.cxx | 1 - sd/source/ui/func/fuline.cxx | 2 +- sd/source/ui/func/fulinend.cxx | 2 +- sd/source/ui/func/fuscale.cxx | 7 +++---- sd/source/ui/func/futransf.cxx | 4 ++-- sd/source/ui/func/futxtatt.cxx | 2 +- sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 +- sd/source/ui/view/drviews2.cxx | 2 +- sd/source/ui/view/drviewsc.cxx | 4 ++-- sd/source/ui/view/sdview2.cxx | 2 +- 11 files changed, 14 insertions(+), 16 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index a62922381155..3917cc02880c 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -374,7 +374,7 @@ BOOL DrawDocShell::CheckPageName (::Window* pWin, String& rName ) { String aDesc( SdResId( STR_WARN_PAGE_EXISTS ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* aNameDlg = pFact ? pFact->CreateSvxNameDialog( pWin, aStrForDlg, aDesc ) : 0; if( aNameDlg ) { aNameDlg->SetEditHelpId( HID_SD_NAMEDIALOG_PAGE ); diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index c3071461c7e3..e070365eddda 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -85,7 +85,6 @@ void FuArea::DoExecute( SfxRequest& rReq ) AbstractSvxAreaTabDialog * pDlg = pFact ? pFact->CreateSvxAreaTabDialog( NULL, &aNewAttr, mpDoc, - RID_SVXDLG_AREA, mpView) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 0ad0d84f19a5..08fdf2eb24b7 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -98,7 +98,7 @@ void FuLine::DoExecute( SfxRequest& rReq ) mpView->GetAttributes( *pNewAttr ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,RID_SVXDLG_LINE,pObj,bHasMarked) : 0; + SfxAbstractTabDialog * pDlg = pFact ? pFact->CreateSvxLineTabDialog(NULL,pNewAttr,mpDoc,pObj,bHasMarked) : 0; if( pDlg && (pDlg->Execute() == RET_OK) ) { mpView->SetAttributes (*(pDlg->GetOutputItemSet ())); diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 6f8373147845..1eb3300d30df 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -140,7 +140,7 @@ void FuLineEnd::DoExecute( SfxRequest& ) } SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( NULL, aName, aDesc ) : 0; if( pDlg ) { diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index 682dc1b4b719..b61836a74cca 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -139,7 +139,7 @@ void FuScale::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr, RID_SVXDLG_ZOOM); + pDlg = pFact->CreateSvxZoomDialog(NULL, aNewAttr); } if( pDlg ) @@ -169,12 +169,11 @@ void FuScale::DoExecute( SfxRequest& rReq ) delete pDlg; - // SvxZoomType eZT = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType (); - switch (((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetType ()) + switch (((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetType ()) { case SVX_ZOOM_PERCENT: { - nValue = ((const SvxZoomItem &) aArgs.Get (RID_SVXDLG_ZOOM)).GetValue (); + nValue = ((const SvxZoomItem &) aArgs.Get (SID_ATTR_ZOOM)).GetValue (); mpViewShell->SetZoom( nValue ); diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index b5db742f70b4..a5782aadb4c8 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -94,7 +94,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if ( pFact ) { - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView, RID_SVXDLG_CAPTION ) ); + std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateCaptionDialog( NULL, mpView ) ); const USHORT* pRange = pDlg->GetInputRanges( *aNewAttr.GetPool() ); SfxItemSet aCombSet( *aNewAttr.GetPool(), pRange ); @@ -114,7 +114,7 @@ void FuTransform::DoExecute( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet,mpView, RID_SVXDLG_TRANSFORM) ); + std::auto_ptr< SfxAbstractTabDialog > pDlg( pFact->CreateSvxTransformTabDialog( NULL, &aSet, mpView ) ); if( pDlg.get() && (pDlg->Execute() == RET_OK) ) { rReq.Done( *( pDlg->GetOutputItemSet() ) ); diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index e94638ecf225..8ab4d8d02a75 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -79,7 +79,7 @@ void FuTextAttrDlg::DoExecute( SfxRequest& rReq ) if( !pArgs ) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, RID_SVXDLG_TEXT, mpView ); + SfxAbstractTabDialog *pDlg = pFact->CreateTextTabDialog( NULL, &aNewAttr, mpView ); USHORT nResult = pDlg->Execute(); diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index a23c1d09a9e0..e5dc07fe80cb 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -905,7 +905,7 @@ void SlotManager::RenameSlide (void) DBG_ASSERT(pFact, "Dialogdiet fail!"); AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( mrSlideSorter.GetActiveWindow(), - aPageName, aDescr, RID_SVXDLG_NAME); + aPageName, aDescr); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); aNameDlg->SetCheckNameHdl( LINK( this, SlotManager, RenameSlideHdl ), true ); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 812bfca1a83d..12b81a01d3ba 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -467,7 +467,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "Dialogdiet fail!"); - AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr, RID_SVXDLG_NAME ); + AbstractSvxNameDialog* aNameDlg = pFact->CreateSvxNameDialog( GetActiveWindow(), aPageName, aDescr ); DBG_ASSERT(aNameDlg, "Dialogdiet fail!"); aNameDlg->SetText( aTitle ); aNameDlg->SetCheckNameHdl( LINK( this, DrawViewShell, RenameSlideHdl ), true ); diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx index 3581fde618a7..e9bad2064c10 100644 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -127,7 +127,7 @@ void DrawViewShell::FuTemp03(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, DrawViewShell, NameObjectHdl)); @@ -162,7 +162,7 @@ void DrawViewShell::FuTemp03(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/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 49a5639980ff..49bbf3149c8b 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -963,7 +963,7 @@ BOOL View::GetExchangeList( List*& rpExchangeList, List* pBookmarkList, USHORT n String aTitle( SdResId( STR_TITLE_NAMEGROUP ) ); String aDesc( SdResId( STR_DESC_NAMEGROUP ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc, RID_SVXDLG_NAME ) : 0; + AbstractSvxNameDialog* pDlg = pFact ? pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), *pNewName, aDesc ) : 0; if( pDlg ) { pDlg->SetEditHelpId( HID_SD_NAMEDIALOG_OBJECT ); -- cgit From 2c0f94218a6775ced54d2dd14242596ed2749b07 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 4 Nov 2009 21:54:56 +0100 Subject: #i196421#: some problems with pch on Windows --- sd/inc/pch/precompiled_sd.hxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sd') diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 8250e050bcf4..360f32e880bf 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -1,4 +1,5 @@ -/************************************************************************* +/************************************************************************cherex + * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -596,7 +597,7 @@ #include "svx/editund2.hxx" #include "svx/editview.hxx" #include "svx/eeitem.hxx" -#include "svx/escherex.hxx" +#include "filter/msfilter/escherex.hxx" #include "svx/escpitem.hxx" #include "svx/extrusionbar.hxx" #include "svx/f3dchild.hxx" @@ -640,8 +641,8 @@ #include "svx/lspcitem.hxx" #include "svx/modctrl.hxx" #include "svx/msdffdef.hxx" -#include "svx/msocximex.hxx" -#include "svx/msoleexp.hxx" +#include "filter/msfilter/msocximex.hxx" +#include "filter/msfilter/msoleexp.hxx" #include "svx/numitem.hxx" #include "svx/obj3d.hxx" #include "svx/objfac3d.hxx" @@ -724,7 +725,7 @@ #include "svx/svxfont.hxx" #include "svx/svxgrahicitem.hxx" #include "svx/svxids.hrc" -#include "svx/svxmsbas.hxx" +#include "filter/msfilter/svxmsbas.hxx" #include "svx/sxciaitm.hxx" #include "svx/sxekitm.hxx" #include "svx/sxelditm.hxx" -- cgit From 76582d69eb4ca5166fb9a41a698bfea4efd466a5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 5 Nov 2009 09:52:12 +0100 Subject: forgot to add filter to build.lst of apps using msfilter --- sd/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sd/prj/build.lst (limited to 'sd') diff --git a/sd/prj/build.lst b/sd/prj/build.lst old mode 100644 new mode 100755 index 00150a5708fd..bc8bf923f7e5 --- a/sd/prj/build.lst +++ b/sd/prj/build.lst @@ -1,4 +1,4 @@ -sd sd : l10n animations svx stoc canvas NULL +sd sd : filter l10n animations svx stoc canvas NULL sd sd usr1 - all sd_mkout NULL sd sd\inc nmake - all sd_inc NULL sd sd\prj get - all sd_prj NULL -- cgit From d1514b06afe83c88d9cdbd037840750951236467 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 12 Nov 2009 11:26:43 +0100 Subject: aw078 #i106541# commited in-between stable version with already advanced metafile decomposition for security reasons --- sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx | 8 ++++---- sd/source/ui/view/sdview.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sd') diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 1a25bedb583b..8a66523280fc 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -728,8 +728,8 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c // get font attributes basegfx::B2DVector aTextSizeAttribute; - const drawinglayer::primitive2d::FontAttributes aFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aTextSizeAttribute, getPageNameFont(), false, @@ -835,7 +835,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c 0, aPageName.Len(), aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); } @@ -876,7 +876,7 @@ Primitive2DSequence SdPageObjectFadeNameNumberPrimitive::create2DDecomposition(c 0, nNumberLen, aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 46a7d71a91fe..d38704bd124c 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -448,8 +448,8 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP aVclFont.SetHeight( 500 ); - const drawinglayer::primitive2d::FontAttributes aFontAttributes( - drawinglayer::primitive2d::getFontAttributesFromVclFont( + const drawinglayer::attribute::FontAttribute aFontAttribute( + drawinglayer::primitive2d::getFontAttributeFromVclFont( aTextSizeAttribute, aVclFont, false, @@ -476,7 +476,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP 0, nTextLength, aDXArray, - aFontAttributes, + aFontAttribute, aLocale, aFontColor)); drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(xRetval, xRef); -- cgit From cd65799aee7f9518572c9ab556e3f55cf449c87f Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 13 Nov 2009 11:04:06 +0100 Subject: sb116: #i106845# removed obsolete IRIX port --- sd/source/helper/simplereferencecomponent.cxx | 2 +- sd/source/ui/func/fubullet.cxx | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'sd') diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 25776e3c420d..2f8bf68dbdf9 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -135,7 +135,7 @@ void SimpleReferenceComponent::operator delete(void * pPtr, ) SAL_THROW(()) { -#if defined WNT || (defined IRIX && !defined GCC) +#if defined WNT ::operator delete(pPtr); // WNT lacks a global nothrow operator delete... #else // WNT ::operator delete(pPtr, rNothrow); diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 64fb3783d78d..a36b7eccbf38 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -52,9 +52,6 @@ #include #include -#ifdef IRIX -#include -#endif #include #include #include "drawview.hxx" -- cgit From 2546b368921c771c4336e6db18543497389eaab7 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Mon, 23 Nov 2009 16:27:16 +0100 Subject: #i105146# fixed mainly by not setting a page to visualize at the SdrPageObj's for handout page --- sd/source/core/sdpage.cxx | 24 +++++++--------------- .../view/SlsPageObjectViewObjectContact.cxx | 14 ++++++++----- sd/source/ui/view/drviews1.cxx | 18 ++++------------ 3 files changed, 20 insertions(+), 36 deletions(-) (limited to 'sd') diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 7f80b5bd763a..998f34363f33 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -302,8 +302,9 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec case PRESOBJ_HANDOUT: { //Erste Standardseite am SdrPageObj vermerken - SdrPage* pFirstPage = ( (SdDrawDocument*) pModel )->GetSdPage(0, PK_STANDARD); - pSdrObj = new SdrPageObj( pFirstPage ); + // #i105146# We want no content to be displayed for PK_HANDOUT, + // so just never set a page as content + pSdrObj = new SdrPageObj(0); pSdrObj->SetResizeProtect(TRUE); } break; @@ -745,28 +746,17 @@ void SdPage::CreateTitleAndLayout(BOOL bInit, BOOL bCreate ) CalculateHandoutAreas( *static_cast< SdDrawDocument* >(GetModel() ), pMasterPage->GetAutoLayout(), false, aAreas ); const bool bSkip = pMasterPage->GetAutoLayout() == AUTOLAYOUT_HANDOUT3; - - sal_uInt16 nPage = 0; std::vector< Rectangle >::iterator iter( aAreas.begin() ); + while( iter != aAreas.end() ) { SdrPageObj* pPageObj = static_cast(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, FALSE, (*iter++), TRUE) ); - - const sal_uInt16 nDestinationPageNum(2 * nPage + 1); - - if(nDestinationPageNum < pModel->GetPageCount()) - { - pPageObj->SetReferencedPage(pModel->GetPage(nDestinationPageNum)); - } - else - { - pPageObj->SetReferencedPage(0L); - } + // #i105146# We want no content to be displayed for PK_HANDOUT, + // so just never set a page as content + pPageObj->SetReferencedPage(0L); if( bSkip && iter != aAreas.end() ) iter++; - - nPage++; } } diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx index 8a66523280fc..8c3fd4532c4f 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx @@ -1191,12 +1191,16 @@ void PageObjectViewObjectContact::ActionChanged (void) // Even when we are called from destructor we still have to invalide // the preview bitmap in the cache. const SdrPage* pPage = GetPage(); - SdDrawDocument* pDocument = dynamic_cast(pPage->GetModel()); - if (mpCache!=NULL && pPage!=NULL && pDocument!=NULL) + + if(pPage) { - cache::PageCacheManager::Instance()->InvalidatePreviewBitmap( - pDocument->getUnoModel(), - GetPage()); + SdDrawDocument* pDocument = dynamic_cast(pPage->GetModel()); + if (mpCache!=NULL && pPage!=NULL && pDocument!=NULL) + { + cache::PageCacheManager::Instance()->InvalidatePreviewBitmap( + pDocument->getUnoModel(), + pPage); + } } // call parent diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 2077a852f960..3d7ec543943b 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -1196,25 +1196,15 @@ BOOL DrawViewShell::SwitchPage(USHORT nSelectedPage) { // set pages for all available handout presentation objects sd::ShapeList& rShapeList = pMaster->GetPresentationShapeList(); - - sal_uInt16 nPgNum = 0; SdrObject* pObj = 0; + while( (pObj = rShapeList.getNextShape(pObj)) != 0 ) { if( pMaster->GetPresObjKind(pObj) == PRESOBJ_HANDOUT ) { - const sal_uInt16 nDestinationPageNum(2 * nPgNum + 1); - - if(nDestinationPageNum < GetDoc()->GetPageCount()) - { - static_cast(pObj)->SetReferencedPage(GetDoc()->GetPage(nDestinationPageNum)); - } - else - { - static_cast(pObj)->SetReferencedPage(0L); - } - - nPgNum++; + // #i105146# We want no content to be displayed for PK_HANDOUT, + // so just never set a page as content + static_cast(pObj)->SetReferencedPage(0); } } } -- cgit From d1515a61d40e8939acb7b695f60d61c21c66bddb Mon Sep 17 00:00:00 2001 From: Christian Lippka Date: Wed, 25 Nov 2009 16:04:16 +0000 Subject: fixed typo --- sd/source/ui/annotations/annotationmanager.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index bbc9bbd539f3..e24b28a0e814 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -199,7 +199,7 @@ AnnotationManagerImpl::AnnotationManagerImpl( ViewShellBase& rViewShellBase ) { SdOptions* pOptions = SD_MOD()->GetSdOptions(mpDoc->GetDocumentType()); if( pOptions ) - mbShowAnnotations = pOptions->IsPreviewTransitions() == sal_True; + mbShowAnnotations = pOptions->IsShowComments() == TRUE; } // -------------------------------------------------------------------- -- cgit From 309c883e002dcd20ec775f323e74bf49c1bc0e06 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 8 Dec 2009 15:18:29 +0100 Subject: some more fixes after resync --- sd/source/ui/func/fuformatpaintbrush.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index eb4ca01ba621..98dbcba52ab2 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include -- cgit