dev/null |binary offapi/com/sun/star/ui/LayoutSize.idl | 2 sc/source/ui/view/formatsh.cxx | 76 +++++----- sd/source/ui/view/drviews9.cxx | 42 ++--- sfx2/source/sidebar/SidebarController.cxx | 16 +- sfx2/source/sidebar/SidebarController.hxx | 3 svx/inc/svx/xtable.hxx | 18 +- svx/source/dialog/dlgctrl.cxx | 4 svx/source/dialog/sdstring.src | 22 +-- svx/source/sidebar/line/LinePropertyPanel.cxx | 6 svx/source/sidebar/line/LinePropertyPanel.hrc | 49 ------ svx/source/sidebar/line/LinePropertyPanel.src | 184 -------------------------- sw/source/core/doc/notxtfrm.cxx | 37 +++++ sw/source/ui/uiview/viewtab.cxx | 37 +++-- 14 files changed, 163 insertions(+), 333 deletions(-)
New commits: commit f8f9cb1148f70f61f486517a1f353c4a3de8211f Author: Armin Le Grand <[email protected]> Date: Thu Apr 11 13:11:46 2013 +0000 i121791 Corrected names for LineDashes, cleaned up resources diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index fc6d826..6ba0dde 100644 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -64,8 +64,8 @@ public: XColorEntry(const XColorEntry& rOther) : XPropertyEntry(rOther), aColor(rOther.aColor) {} - void SetColor(const Color& rColor) { aColor = rColor; } - Color& GetColor() { return aColor; } + void SetColor(const Color& rColor) { aColor = rColor; } + const Color& GetColor() const { return aColor; } }; // -------------------- @@ -92,7 +92,7 @@ public: aB2DPolyPolygon = rB2DPolyPolygon; } - basegfx::B2DPolyPolygon& GetLineEnd() + const basegfx::B2DPolyPolygon& GetLineEnd() const { return aB2DPolyPolygon; } @@ -112,8 +112,8 @@ public: XDashEntry(const XDashEntry& rOther) : XPropertyEntry(rOther), aDash(rOther.aDash) {} - void SetDash(const XDash& rDash) { aDash = rDash; } - XDash& GetDash() { return aDash; } + void SetDash(const XDash& rDash) { aDash = rDash; } + const XDash& GetDash() const { return aDash; } }; // ------------------ @@ -130,8 +130,8 @@ public: XHatchEntry(const XHatchEntry& rOther) : XPropertyEntry(rOther), aHatch(rOther.aHatch) {} - void SetHatch(const XHatch& rHatch) { aHatch = rHatch; } - XHatch& GetHatch() { return aHatch; } + void SetHatch(const XHatch& rHatch) { aHatch = rHatch; } + const XHatch& GetHatch() const { return aHatch; } }; // --------------------- @@ -148,8 +148,8 @@ public: XGradientEntry(const XGradientEntry& rOther) : XPropertyEntry(rOther), aGradient(rOther.aGradient) {} - void SetGradient(const XGradient& rGrad) { aGradient = rGrad; } - XGradient& GetGradient() { return aGradient; } + void SetGradient(const XGradient& rGrad) { aGradient = rGrad; } + const XGradient& GetGradient() const { return aGradient; } }; // --------------------- diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 54e58a3..b17e6aa 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1210,7 +1210,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt ) sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode(); pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); - XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch(); + const XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch(); MapMode aMode( MAP_100TH_MM ); Hatch aHatch( (HatchStyle) rXHatch.GetHatchStyle(), rXHatch.GetColor(), @@ -1366,7 +1366,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) { OutputDevice* pDevice = rUDEvt.GetDevice(); - XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient(); + const XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient(); Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() ); aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() ); aGradient.SetBorder( rXGrad.GetBorder() ); diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index ff27ca1..9eb9e27 100644 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -992,47 +992,47 @@ String RID_SVXSTR_DASH11_DEF String RID_SVXSTR_DASH0 { - Text [ en-US ] = "Ultrafine dashed"; + Text [ en-US ] = "Ultrafine Dashed"; }; String RID_SVXSTR_DASH1 { - Text [ en-US ] = "Fine dashed"; + Text [ en-US ] = "Fine Dashed"; }; String RID_SVXSTR_DASH2 { - Text [ en-US ] = "Ultrafine 2 dots 3 dashes"; + Text [ en-US ] = "Ultrafine 2 Dots 3 Dashes"; }; String RID_SVXSTR_DASH3 { - Text [ en-US ] = "Fine dotted"; + Text [ en-US ] = "Fine Dotted"; }; String RID_SVXSTR_DASH4 { - Text [ en-US ] = "Line with fine dots"; + Text [ en-US ] = "Line with Fine Dots"; }; String RID_SVXSTR_DASH5 { - Text [ en-US ] = "Fine dashed (variable)"; + Text [ en-US ] = "Fine Dashed (var)"; }; String RID_SVXSTR_DASH6 { - Text [ en-US ] = "3 dashes 3 dots (variable)"; + Text [ en-US ] = "3 Dashes 3 Dots (var)"; }; String RID_SVXSTR_DASH7 { - Text [ en-US ] = "Ultrafine dotted (variable)"; + Text [ en-US ] = "Ultrafine Dotted (var)"; }; String RID_SVXSTR_DASH8 { - Text [ en-US ] = "Line style 9"; + Text [ en-US ] = "Line Style 9"; }; String RID_SVXSTR_DASH9 { - Text [ en-US ] = "2 dots 1 dash"; + Text [ en-US ] = "2 Dots 1 Dash"; }; String RID_SVXSTR_DASH10 { - Text [ en-US ] = "Dashed (variable)"; + Text [ en-US ] = "Dashed (var)"; }; String RID_SVXSTR_DASH11 { diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index e6234b6..8c0811f 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -760,7 +760,11 @@ IMPL_LINK(LinePropertyPanel, ChangeLineStyleHdl, ToolBox*, /* pToolBox */) { // XLINE_DASH const XLineStyleItem aItemA(XLINE_DASH); - const XLineDashItem aItemB(mpLBStyle->GetSelectEntry(), mpLineStyleList->GetDash(nPos - 2)->GetDash()); + const XDashEntry* pDashEntry = mpLineStyleList->GetDash(nPos - 2); + OSL_ENSURE(pDashEntry, "OOps, got empty XDash from XDashList (!)"); + const XLineDashItem aItemB( + pDashEntry ? pDashEntry->GetName() : String(), + pDashEntry ? pDashEntry->GetDash() : XDash()); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aItemB, 0L); diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc index 5adb139..e552016 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hrc +++ b/svx/source/sidebar/line/LinePropertyPanel.hrc @@ -77,55 +77,6 @@ #define VS_STYLE 1 #define PB_OPTIONS 2 -#define IMG_LINE1 5 -#define IMG_LINE1_S 6 -#define IMG_LINE2 7 -#define IMG_LINE2_S 8 -#define IMG_LINE3 9 -#define IMG_LINE3_S 10 -#define IMG_LINE4 11 -#define IMG_LINE4_S 12 -#define IMG_LINE5 13 -#define IMG_LINE5_S 14 -#define IMG_LINE6 15 -#define IMG_LINE6_S 16 -#define IMG_LINE7 17 -#define IMG_LINE7_S 18 -#define IMG_LINE8 19 -#define IMG_LINE8_S 20 -#define IMG_LINE9 21 -#define IMG_LINE9_S 22 -#define IMG_LINE10 23 -#define IMG_LINE10_S 24 -#define IMG_LINE11 25 -#define IMG_LINE11_S 26 - -// #define STR_STYLE_NONE_TIP 30 -#define STR_STYLE_NONE 31 -#define STR_STYLE_LINE1 32 -#define STR_STYLE_LINE2 33 -#define STR_STYLE_LINE3 34 -#define STR_STYLE_LINE4 35 -#define STR_STYLE_LINE5 36 -#define STR_STYLE_LINE6 37 -#define STR_STYLE_LINE7 38 -#define STR_STYLE_LINE8 39 -#define STR_STYLE_LINE9 40 -#define STR_STYLE_LINE10 41 -#define STR_STYLE_LINE11 42 - -#define IMG_LINE1_H 43 -#define IMG_LINE2_H 44 -#define IMG_LINE3_H 45 -#define IMG_LINE4_H 46 -#define IMG_LINE5_H 47 -#define IMG_LINE6_H 48 -#define IMG_LINE7_H 49 -#define IMG_LINE8_H 50 -#define IMG_LINE9_H 51 -#define IMG_LINE10_H 52 -#define IMG_LINE11_H 53 - //width popup page #define VS_WIDTH 1 #define MF_WIDTH 2 diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src index acf994c..e4f6fde 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.src +++ b/svx/source/sidebar/line/LinePropertyPanel.src @@ -359,190 +359,6 @@ Control RID_POPUPPANEL_LINEPAGE_STYLE TabStop = TRUE; Text [ en-US ] = "~More Options..."; }; - - String STR_STYLE_NONE - { - Text [ en-US ] = "None"; - }; - String STR_STYLE_LINE1 - { - Text [ en-US ] = "Continuous"; - }; - String STR_STYLE_LINE2 - { - Text [ en-US ] = "Ultrafine dashed"; - }; - String STR_STYLE_LINE3 - { - Text [ en-US ] = "Dashed (variable)"; - }; - String STR_STYLE_LINE4 - { - Text [ en-US ] = "Fine dashed (variable)"; - }; - String STR_STYLE_LINE5 - { - Text [ en-US ] = "Fine dashed"; - }; - String STR_STYLE_LINE6 - { - Text [ en-US ] = "Fine dotted"; - }; - String STR_STYLE_LINE7 - { - Text [ en-US ] = "Ultrafine dotted (variable)"; - }; - String STR_STYLE_LINE8 - { - Text [ en-US ] = "3 dashes 3 dots (variable)"; - }; - String STR_STYLE_LINE9 - { - Text [ en-US ] = "2 dots 1 dash"; - }; - String STR_STYLE_LINE10 - { - Text [ en-US ] = "Ultrafine 2 dots 3 dashes"; - }; - String STR_STYLE_LINE11 - { - Text [ en-US ] = "Line with fine dots"; - }; - - Image IMG_LINE1 - { - ImageBitmap = Bitmap{File = "symphony/style_line1.png";}; - }; - Image IMG_LINE1_S - { - ImageBitmap = Bitmap{File = "symphony/style_line1_h.png";}; - }; - Image IMG_LINE2 - { - ImageBitmap = Bitmap{File = "symphony/style_line2.png";}; - }; - Image IMG_LINE2_S - { - ImageBitmap = Bitmap{File = "symphony/style_line2_h.png";}; - }; - Image IMG_LINE3 - { - ImageBitmap = Bitmap{File = "symphony/style_line3.png";}; - }; - Image IMG_LINE3_S - { - ImageBitmap = Bitmap{File = "symphony/style_line3_h.png";}; - }; - Image IMG_LINE4 - { - ImageBitmap = Bitmap{File = "symphony/style_line4.png";}; - }; - Image IMG_LINE4_S - { - ImageBitmap = Bitmap{File = "symphony/style_line4_h.png";}; - }; - Image IMG_LINE5 - { - ImageBitmap = Bitmap{File = "symphony/style_line5.png";}; - }; - Image IMG_LINE5_S - { - ImageBitmap = Bitmap{File = "symphony/style_line5_h.png";}; - }; - Image IMG_LINE6 - { - ImageBitmap = Bitmap{File = "symphony/style_line6.png";}; - }; - Image IMG_LINE6_S - { - ImageBitmap = Bitmap{File = "symphony/style_line6_h.png";}; - }; - Image IMG_LINE7 - { - ImageBitmap = Bitmap{File = "symphony/style_line7.png";}; - }; - Image IMG_LINE7_S - { - ImageBitmap = Bitmap{File = "symphony/style_line7_h.png";}; - }; - Image IMG_LINE8 - { - ImageBitmap = Bitmap{File = "symphony/style_line8.png";}; - }; - Image IMG_LINE8_S - { - ImageBitmap = Bitmap{File = "symphony/style_line8_h.png";}; - }; - Image IMG_LINE9 - { - ImageBitmap = Bitmap{File = "symphony/style_line9.png";}; - }; - Image IMG_LINE9_S - { - ImageBitmap = Bitmap{File = "symphony/style_line9_h.png";}; - }; - Image IMG_LINE10 - { - ImageBitmap = Bitmap{File = "symphony/style_line10.png";}; - }; - Image IMG_LINE10_S - { - ImageBitmap = Bitmap{File = "symphony/style_line10_h.png";}; - }; - Image IMG_LINE11 - { - ImageBitmap = Bitmap{File = "symphony/style_line11.png";}; - }; - Image IMG_LINE11_S - { - ImageBitmap = Bitmap{File = "symphony/style_line11_h.png";}; - }; - - //high contrast - Image IMG_LINE1_H - { - ImageBitmap = Bitmap{File = "symphony/style_line1_hh.png";}; - }; - Image IMG_LINE2_H - { - ImageBitmap = Bitmap{File = "symphony/style_line2_hh.png";}; - }; - Image IMG_LINE3_H - { - ImageBitmap = Bitmap{File = "symphony/style_line3_hh.png";}; - }; - Image IMG_LINE4_H - { - ImageBitmap = Bitmap{File = "symphony/style_line4_hh.png";}; - }; - Image IMG_LINE5_H - { - ImageBitmap = Bitmap{File = "symphony/style_line5_hh.png";}; - }; - Image IMG_LINE6_H - { - ImageBitmap = Bitmap{File = "symphony/style_line6_hh.png";}; - }; - Image IMG_LINE7_H - { - ImageBitmap = Bitmap{File = "symphony/style_line7_hh.png";}; - }; - Image IMG_LINE8_H - { - ImageBitmap = Bitmap{File = "symphony/style_line8_hh.png";}; - }; - Image IMG_LINE9_H - { - ImageBitmap = Bitmap{File = "symphony/style_line9_hh.png";}; - }; - Image IMG_LINE10_H - { - ImageBitmap = Bitmap{File = "symphony/style_line10_hh.png";}; - }; - Image IMG_LINE11_H - { - ImageBitmap = Bitmap{File = "symphony/style_line11_hh.png";}; - }; }; Control RID_POPUPPANEL_LINEPAGE_WIDTH { commit 436b901a3b195a7e5089d1a03a46ed9442239610 Author: Armin Le Grand <[email protected]> Date: Thu Apr 11 13:09:19 2013 +0000 i122039 Take GraphicAttr into account for SVGs in Writer GraphicObjects diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 2c5b258..c76520f 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -75,6 +75,8 @@ #include <drawinglayer/processor2d/baseprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <drawinglayer/processor2d/processor2dtools.hxx> +#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> using namespace com::sun::star; @@ -1036,10 +1038,43 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons aAlignedGrfArea.Left(), aAlignedGrfArea.Top(), aAlignedGrfArea.Right(), aAlignedGrfArea.Bottom()); const bool bCropped(aGrfAttr.IsCropped()); + drawinglayer::primitive2d::Primitive2DSequence aContent; + GraphicAttr aSuppressGraphicAttr(aGrfAttr); + + aSuppressGraphicAttr.SetCrop(0, 0, 0, 0); + aSuppressGraphicAttr.SetRotation(0); + aSuppressGraphicAttr.SetMirrorFlags(0); + + const bool bNeedTransformedGraphic( + aSuppressGraphicAttr.IsSpecialDrawMode() || + aSuppressGraphicAttr.IsAdjusted() || + aSuppressGraphicAttr.IsMirrored() || + aSuppressGraphicAttr.IsRotated() || + aSuppressGraphicAttr.IsTransparent()); + + if(bNeedTransformedGraphic) + { + // #122039# need to apply graphic transformation if GraphicAttr are used qwhich need this + const Graphic aTransformedGraphic(rGrfObj.GetTransformedGraphic(&aSuppressGraphicAttr)); + const basegfx::B2DRange aRange(rSvgDataPtr->getRange()); + const basegfx::B2DHomMatrix aTransform( + basegfx::tools::createScaleTranslateB2DHomMatrix( + aRange.getRange(), + aRange.getMinimum())); + + aContent.realloc(1); + aContent[0] = new drawinglayer::primitive2d::BitmapPrimitive2D( + aTransformedGraphic.GetBitmapEx(), + aTransform); + } + else + { + aContent = rSvgDataPtr->getPrimitive2DSequence(); + } bDone = paintUsingPrimitivesHelper( *pOut, - rSvgDataPtr->getPrimitive2DSequence(), + aContent, rSvgDataPtr->getRange(), aTargetRange, bCropped ? aGrfAttr.GetLeftCrop() : 0, commit f45335265ec5597510bf7a17cf521906c0288b9d Author: Armin Le Grand <[email protected]> Date: Thu Apr 11 13:08:22 2013 +0000 i121791 Corrected names for LineDashes, cleaned up resources diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 67670ef..0b3f762 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -386,13 +386,13 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pEntry->GetName () == pName->GetValue ()) { - XGradient &rGradient = pEntry->GetGradient (); + XGradient aGradient(pEntry->GetGradient()); - if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) rGradient.SetStartColor (aColor); - else rGradient.SetEndColor (aColor); + if (rReq.GetSlot () == SID_SETGRADSTARTCOLOR) aGradient.SetStartColor (aColor); + else aGradient.SetEndColor (aColor); pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE); - pAttr->Put (XFillGradientItem (pName->GetValue (), rGradient), XATTR_FILLGRADIENT); + pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT); break; } } @@ -446,12 +446,12 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pEntry->GetName () == pName->GetValue ()) { - XHatch &rHatch = pEntry->GetHatch (); + XHatch aHatch(pEntry->GetHatch()); - rHatch.SetColor (aColor); + aHatch.SetColor (aColor); pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE); - pAttr->Put (XFillHatchItem (pName->GetValue (), rHatch), XATTR_FILLHATCH); + pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH); break; } } @@ -557,18 +557,18 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pEntry->GetName () == pName->GetValue ()) { - XGradient &rGradient = pEntry->GetGradient (); + XGradient aGradient(pEntry->GetGradient()); - rGradient.SetGradientStyle ((XGradientStyle) pStyle->GetValue ()); - rGradient.SetAngle (pAngle->GetValue () * 10); - rGradient.SetBorder ((short) pBorder->GetValue ()); - rGradient.SetXOffset ((short) pCenterX->GetValue ()); - rGradient.SetYOffset ((short) pCenterY->GetValue ()); - rGradient.SetStartIntens ((short) pStart->GetValue ()); - rGradient.SetEndIntens ((short) pEnd->GetValue ()); + aGradient.SetGradientStyle ((XGradientStyle) pStyle->GetValue ()); + aGradient.SetAngle (pAngle->GetValue () * 10); + aGradient.SetBorder ((short) pBorder->GetValue ()); + aGradient.SetXOffset ((short) pCenterX->GetValue ()); + aGradient.SetYOffset ((short) pCenterY->GetValue ()); + aGradient.SetStartIntens ((short) pStart->GetValue ()); + aGradient.SetEndIntens ((short) pEnd->GetValue ()); pAttr->Put (XFillStyleItem (XFILL_GRADIENT), XATTR_FILLSTYLE); - pAttr->Put (XFillGradientItem (pName->GetValue (), rGradient), XATTR_FILLGRADIENT); + pAttr->Put (XFillGradientItem (pName->GetValue (), aGradient), XATTR_FILLGRADIENT); break; } } @@ -623,14 +623,14 @@ void DrawViewShell::AttrExec (SfxRequest &rReq) if (pEntry->GetName () == pName->GetValue ()) { - XHatch &rHatch = pEntry->GetHatch (); + XHatch aHatch(pEntry->GetHatch()); - rHatch.SetHatchStyle ((XHatchStyle) pStyle->GetValue ()); - rHatch.SetDistance (pDistance->GetValue ()); - rHatch.SetAngle (pAngle->GetValue () * 10); + aHatch.SetHatchStyle ((XHatchStyle) pStyle->GetValue ()); + aHatch.SetDistance (pDistance->GetValue ()); + aHatch.SetAngle (pAngle->GetValue () * 10); pAttr->Put (XFillStyleItem (XFILL_HATCH), XATTR_FILLSTYLE); - pAttr->Put (XFillHatchItem (pName->GetValue (), rHatch), XATTR_FILLHATCH); + pAttr->Put (XFillHatchItem (pName->GetValue (), aHatch), XATTR_FILLHATCH); break; } } commit ef75cc7bf6ceb6ecf5f2fb32dd560ef05303f1f2 Author: Armin Le Grand <[email protected]> Date: Thu Apr 11 13:08:10 2013 +0000 i121791 Corrected names for LineDashes, cleaned up resources diff --git a/default_images/svx/res/symphony/style_line1.png b/default_images/svx/res/symphony/style_line1.png deleted file mode 100755 index 6403c06..0000000 Binary files a/default_images/svx/res/symphony/style_line1.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line10.png b/default_images/svx/res/symphony/style_line10.png deleted file mode 100755 index f7d1e34..0000000 Binary files a/default_images/svx/res/symphony/style_line10.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line10_h.png b/default_images/svx/res/symphony/style_line10_h.png deleted file mode 100755 index d5925aa..0000000 Binary files a/default_images/svx/res/symphony/style_line10_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line10_hh.png b/default_images/svx/res/symphony/style_line10_hh.png deleted file mode 100755 index 60c1e36..0000000 Binary files a/default_images/svx/res/symphony/style_line10_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line11.png b/default_images/svx/res/symphony/style_line11.png deleted file mode 100755 index 4400dd3..0000000 Binary files a/default_images/svx/res/symphony/style_line11.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line11_h.png b/default_images/svx/res/symphony/style_line11_h.png deleted file mode 100755 index 1e6be19..0000000 Binary files a/default_images/svx/res/symphony/style_line11_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line11_hh.png b/default_images/svx/res/symphony/style_line11_hh.png deleted file mode 100755 index 31fec10..0000000 Binary files a/default_images/svx/res/symphony/style_line11_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line1_h.png b/default_images/svx/res/symphony/style_line1_h.png deleted file mode 100755 index eadd40e..0000000 Binary files a/default_images/svx/res/symphony/style_line1_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line1_hh.png b/default_images/svx/res/symphony/style_line1_hh.png deleted file mode 100755 index c91010a..0000000 Binary files a/default_images/svx/res/symphony/style_line1_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line2.png b/default_images/svx/res/symphony/style_line2.png deleted file mode 100755 index 4269c7d..0000000 Binary files a/default_images/svx/res/symphony/style_line2.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line2_h.png b/default_images/svx/res/symphony/style_line2_h.png deleted file mode 100755 index 3658e18..0000000 Binary files a/default_images/svx/res/symphony/style_line2_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line2_hh.png b/default_images/svx/res/symphony/style_line2_hh.png deleted file mode 100755 index 4bae815..0000000 Binary files a/default_images/svx/res/symphony/style_line2_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line3.png b/default_images/svx/res/symphony/style_line3.png deleted file mode 100755 index 3e03ad0..0000000 Binary files a/default_images/svx/res/symphony/style_line3.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line3_h.png b/default_images/svx/res/symphony/style_line3_h.png deleted file mode 100755 index 1636e05..0000000 Binary files a/default_images/svx/res/symphony/style_line3_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line3_hh.png b/default_images/svx/res/symphony/style_line3_hh.png deleted file mode 100755 index 1ab133f..0000000 Binary files a/default_images/svx/res/symphony/style_line3_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line4.png b/default_images/svx/res/symphony/style_line4.png deleted file mode 100755 index 21c1115..0000000 Binary files a/default_images/svx/res/symphony/style_line4.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line4_h.png b/default_images/svx/res/symphony/style_line4_h.png deleted file mode 100755 index 3574140..0000000 Binary files a/default_images/svx/res/symphony/style_line4_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line4_hh.png b/default_images/svx/res/symphony/style_line4_hh.png deleted file mode 100755 index d7b17f4..0000000 Binary files a/default_images/svx/res/symphony/style_line4_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line5.png b/default_images/svx/res/symphony/style_line5.png deleted file mode 100755 index 8648065..0000000 Binary files a/default_images/svx/res/symphony/style_line5.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line5_h.png b/default_images/svx/res/symphony/style_line5_h.png deleted file mode 100755 index 5d387d4..0000000 Binary files a/default_images/svx/res/symphony/style_line5_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line5_hh.png b/default_images/svx/res/symphony/style_line5_hh.png deleted file mode 100755 index c6436ac..0000000 Binary files a/default_images/svx/res/symphony/style_line5_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line6.png b/default_images/svx/res/symphony/style_line6.png deleted file mode 100755 index b0b8d7c..0000000 Binary files a/default_images/svx/res/symphony/style_line6.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line6_h.png b/default_images/svx/res/symphony/style_line6_h.png deleted file mode 100755 index 4a34861..0000000 Binary files a/default_images/svx/res/symphony/style_line6_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line6_hh.png b/default_images/svx/res/symphony/style_line6_hh.png deleted file mode 100755 index 8868076..0000000 Binary files a/default_images/svx/res/symphony/style_line6_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line7.png b/default_images/svx/res/symphony/style_line7.png deleted file mode 100755 index e30fc03..0000000 Binary files a/default_images/svx/res/symphony/style_line7.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line7_h.png b/default_images/svx/res/symphony/style_line7_h.png deleted file mode 100755 index 8718ef0..0000000 Binary files a/default_images/svx/res/symphony/style_line7_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line7_hh.png b/default_images/svx/res/symphony/style_line7_hh.png deleted file mode 100755 index 76d0afa..0000000 Binary files a/default_images/svx/res/symphony/style_line7_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line8.png b/default_images/svx/res/symphony/style_line8.png deleted file mode 100755 index 5c3ed31..0000000 Binary files a/default_images/svx/res/symphony/style_line8.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line8_h.png b/default_images/svx/res/symphony/style_line8_h.png deleted file mode 100755 index db769a4..0000000 Binary files a/default_images/svx/res/symphony/style_line8_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line8_hh.png b/default_images/svx/res/symphony/style_line8_hh.png deleted file mode 100755 index a1ca0e8..0000000 Binary files a/default_images/svx/res/symphony/style_line8_hh.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line9.png b/default_images/svx/res/symphony/style_line9.png deleted file mode 100755 index 10035ba..0000000 Binary files a/default_images/svx/res/symphony/style_line9.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line9_h.png b/default_images/svx/res/symphony/style_line9_h.png deleted file mode 100755 index 91062da..0000000 Binary files a/default_images/svx/res/symphony/style_line9_h.png and /dev/null differ diff --git a/default_images/svx/res/symphony/style_line9_hh.png b/default_images/svx/res/symphony/style_line9_hh.png deleted file mode 100755 index 4726c7c..0000000 Binary files a/default_images/svx/res/symphony/style_line9_hh.png and /dev/null differ commit 6a56f5db1d478297aedd3395a882fc2dcce80e82 Author: Andre Fischer <[email protected]> Date: Thu Apr 11 12:29:52 2013 +0000 122027: Fixed crash when processing .uno:NumberType command. Reported by: Ariel Constenla-Haile Patch by: Ariel Constenla-Haile Review by: Andre Fischer diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 497a239..42d2807 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -1105,45 +1105,49 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) break; case SID_NUMBER_TYPE_FORMAT: + if ( pReqArgs ) { - SfxInt16Item aFormatItem((const SfxInt16Item&)rReq.GetArgs()->Get(nSlot)); - sal_uInt16 nFormat = aFormatItem.GetValue(); - switch(nFormat) + const SfxPoolItem* pItem; + if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET ) { - case 0: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER); //Modify - break; - case 1: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 2 ); //Modify - break; - case 2: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT ); - break; - case 3: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY ); - break; - case 4: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE ); - break; - case 5: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME ); - break; - case 6: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC ); - break; - case 7: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_FRACTION ); - break; - case 8: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_LOGICAL ); - break; - case 9: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_TEXT ); - break; - default: - ; + sal_uInt16 nFormat = ((SfxInt16Item *)pItem)->GetValue(); + switch(nFormat) + { + case 0: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER); //Modify + break; + case 1: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 2 ); //Modify + break; + case 2: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT ); + break; + case 3: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY ); + break; + case 4: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE ); + break; + case 5: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME ); + break; + case 6: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC ); + break; + case 7: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_FRACTION ); + break; + case 8: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_LOGICAL ); + break; + case 9: + pTabViewShell->SetNumberFormat( NUMBERFORMAT_TEXT ); + break; + default: + ; + } + rReq.Done(); } - rReq.Done(); } break; commit 717671a6ec6eab7d87fe7236bb792569151e6b08 Author: Andre Fischer <[email protected]> Date: Thu Apr 11 12:20:30 2013 +0000 122028: Fixed crash when processing .uno:SwPageColumn command. Reported by: Ariel Constenla-Haile Patch by: Ariel Constenla-Haile Review by: Andre Fischer diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx index 34552df..f70ae7c 100644 --- a/sw/source/ui/uiview/viewtab.cxx +++ b/sw/source/ui/uiview/viewtab.cxx @@ -276,6 +276,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) const sal_Bool bBrowse = rSh.GetViewOptions()->getBrowseMode(); const sal_uInt16 nSlot = rReq.GetSlot(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); const sal_uInt16 nDescId = rSh.GetCurPageDesc(); const SwPageDesc& rDesc = rSh.GetPageDesc( nDescId ); @@ -299,8 +300,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) switch( nSlot ) { case SID_ATTR_LONG_LRSPACE: + if ( pReqArgs ) { - SvxLongLRSpaceItem aLongLR( (const SvxLongLRSpaceItem&)rReq.GetArgs()-> + SvxLongLRSpaceItem aLongLR( (const SvxLongLRSpaceItem&)pReqArgs-> Get( SID_ATTR_LONG_LRSPACE ) ); SvxLRSpaceItem aLR(RES_LR_SPACE); if ( !bSect && (bFrmSelection || nFrmType & FRMTYPE_FLY_ANY) ) @@ -440,8 +442,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) // apply new left and right margins to current page style case SID_ATTR_PAGE_LRSPACE: + if ( pReqArgs ) { - const SvxLongLRSpaceItem aLongLR( static_cast<const SvxLongLRSpaceItem&>(rReq.GetArgs()->Get( SID_ATTR_PAGE_LRSPACE )) ); + const SvxLongLRSpaceItem aLongLR( static_cast<const SvxLongLRSpaceItem&>(pReqArgs->Get( SID_ATTR_PAGE_LRSPACE )) ); SwPageDesc aDesc( rDesc ); { @@ -456,8 +459,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) break; case SID_ATTR_LONG_ULSPACE: + if ( pReqArgs ) { - SvxLongULSpaceItem aLongULSpace( (const SvxLongULSpaceItem&)rReq.GetArgs()-> + SvxLongULSpaceItem aLongULSpace( (const SvxLongULSpaceItem&)pReqArgs-> Get( SID_ATTR_LONG_ULSPACE )); if( bFrmSelection || nFrmType & FRMTYPE_FLY_ANY ) @@ -579,9 +583,10 @@ void SwView::ExecTabWin( SfxRequest& rReq ) // apply new top and bottom margins to current page style case SID_ATTR_PAGE_ULSPACE: + if ( pReqArgs ) { SvxLongULSpaceItem aLongULSpace( - static_cast<const SvxLongULSpaceItem&>(rReq.GetArgs()->Get( SID_ATTR_PAGE_ULSPACE ) ) ); + static_cast<const SvxLongULSpaceItem&>(pReqArgs->Get( SID_ATTR_PAGE_ULSPACE ) ) ); SwPageDesc aDesc( rDesc ); { @@ -595,8 +600,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) break; case SID_ATTR_PAGE_COLUMN: + if ( pReqArgs ) { - const SfxInt16Item aColumnItem( (const SfxInt16Item&)rReq.GetArgs()->Get(nSlot) ); + const SfxInt16Item aColumnItem( (const SfxInt16Item&)pReqArgs->Get(nSlot) ); const sal_uInt16 nPageColumnType = aColumnItem.GetValue(); // nPageColumnType = @@ -654,9 +660,10 @@ void SwView::ExecTabWin( SfxRequest& rReq ) case SID_ATTR_TABSTOP_VERTICAL: case SID_ATTR_TABSTOP: + if ( pReqArgs ) { sal_uInt16 nWhich = GetPool().GetWhich(nSlot); - SvxTabStopItem aTabStops( (const SvxTabStopItem&)rReq.GetArgs()-> + SvxTabStopItem aTabStops( (const SvxTabStopItem&)pReqArgs-> Get( nWhich )); aTabStops.SetWhich(RES_PARATR_TABSTOP); const SvxTabStopItem& rDefTabs = @@ -691,9 +698,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) case SID_ATTR_PARA_LRSPACE_VERTICAL: case SID_ATTR_PARA_LRSPACE: + if ( pReqArgs ) { - SvxLRSpaceItem aParaMargin((const SvxLRSpaceItem&)rReq. - GetArgs()->Get(nSlot)); + SvxLRSpaceItem aParaMargin((const SvxLRSpaceItem&)pReqArgs->Get(nSlot)); if(nFrmType & FRMTYPE_FLY_ANY) { sal_Bool bFirstColumn = sal_True; @@ -789,9 +796,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) break; case SID_ATTR_PARA_ULSPACE: + if ( pReqArgs ) { - SvxULSpaceItem aParaMargin((const SvxULSpaceItem&)rReq. - GetArgs()->Get(nSlot)); + SvxULSpaceItem aParaMargin((const SvxULSpaceItem&)pReqArgs->Get(nSlot)); long nUDist = 0; long nLDist = 0; @@ -813,9 +820,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) case SID_RULER_BORDERS_VERTICAL: case SID_RULER_BORDERS: + if ( pReqArgs ) { - SvxColumnItem aColItem((const SvxColumnItem&)rReq. - GetArgs()->Get(nSlot)); + SvxColumnItem aColItem((const SvxColumnItem&)pReqArgs->Get(nSlot)); if( bSetTabColFromDoc || (!bSect && rSh.GetTableFmt()) ) { @@ -945,9 +952,9 @@ void SwView::ExecTabWin( SfxRequest& rReq ) case SID_RULER_ROWS : case SID_RULER_ROWS_VERTICAL: + if ( pReqArgs ) { - SvxColumnItem aColItem((const SvxColumnItem&)rReq. - GetArgs()->Get(nSlot)); + SvxColumnItem aColItem((const SvxColumnItem&)pReqArgs->Get(nSlot)); if( bSetTabColFromDoc || (!bSect && rSh.GetTableFmt()) ) { @@ -991,7 +998,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) } sal_Bool bSingleLine = sal_False; const SfxPoolItem* pSingleLine; - if( SFX_ITEM_SET == rReq.GetArgs()->GetItemState(SID_RULER_ACT_LINE_ONLY, sal_False, &pSingleLine)) + if( SFX_ITEM_SET == pReqArgs->GetItemState(SID_RULER_ACT_LINE_ONLY, sal_False, &pSingleLine)) bSingleLine = ((const SfxBoolItem*)pSingleLine)->GetValue(); if ( bSetTabRowFromDoc ) { commit 2784b2266ba8ce1dcd899a06626669dfd4dadde5 Author: Andre Fischer <[email protected]> Date: Thu Apr 11 12:10:36 2013 +0000 122030: Fixed bug in documentation that breaks autodoc processing. Found and patched by: Ariel Constenla-Haile Review by: Andre Fischer diff --git a/offapi/com/sun/star/ui/LayoutSize.idl b/offapi/com/sun/star/ui/LayoutSize.idl index 7c8fad8..065a7d0 100644 --- a/offapi/com/sun/star/ui/LayoutSize.idl +++ b/offapi/com/sun/star/ui/LayoutSize.idl @@ -26,7 +26,7 @@ module com { module sun { module star { module ui { /** Size used for layouting windows. It specifies a range of valid values and a preferred value. - The values must not violate the relation 0 <= Minimum <= Preferred <= Maximum. + The values must not violate the relation 0 <= Minimum <= Preferred <= Maximum. @param Minimum Zero or positive. The value itself is included in the valid commit d179a612f5f9c01776ea52bfdcf27f1cb864f249 Author: Andre Fischer <[email protected]> Date: Thu Apr 11 12:04:57 2013 +0000 121420: Provide sidebar panels with XCanvas objects. diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index ef214a5..df012dc 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -41,6 +41,8 @@ #include "splitwin.hxx" #include <svl/smplhint.hxx> #include <tools/link.hxx> +#include <toolkit/helper/vclunohelper.hxx> + #include <comphelper/componentfactory.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/componentcontext.hxx> @@ -53,6 +55,7 @@ #include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/URL.hpp> +#include <com/sun/star/rendering/XSpriteCanvas.hpp> #include <boost/bind.hpp> #include <boost/function.hpp> @@ -498,6 +501,7 @@ bool SidebarController::ArePanelSetsEqual ( const SharedPanelContainer& rCurrentPanels, const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels) { +#ifdef DEBUG OSL_TRACE("current panel list:"); for (SharedPanelContainer::const_iterator iPanel(rCurrentPanels.begin()), @@ -517,6 +521,7 @@ bool SidebarController::ArePanelSetsEqual ( { OSL_TRACE(" panel %s", S2A(iId->msId)); } +#endif if (rCurrentPanels.size() != rRequestedPanels.size()) return false; @@ -560,7 +565,8 @@ SharedPanel SidebarController::CreatePanel ( // Create the XUIElement. Reference<ui::XUIElement> xUIElement (CreateUIElement( pPanel->GetComponentInterface(), - pPanelDescriptor->msImplementationURL)); + pPanelDescriptor->msImplementationURL, + pPanelDescriptor->mbWantsCanvas)); if (xUIElement.is()) { // Initialize the panel and add it to the active deck. @@ -579,7 +585,8 @@ SharedPanel SidebarController::CreatePanel ( Reference<ui::XUIElement> SidebarController::CreateUIElement ( const Reference<awt::XWindowPeer>& rxWindow, - const ::rtl::OUString& rsImplementationURL) + const ::rtl::OUString& rsImplementationURL, + const bool bWantsCanvas) { try { @@ -597,6 +604,11 @@ Reference<ui::XUIElement> SidebarController::CreateUIElement ( aCreationArguments.put("SfxBindings", makeAny(sal_uInt64(&pSfxDockingWindow->GetBindings()))); aCreationArguments.put("Theme", Theme::GetPropertySet()); aCreationArguments.put("Sidebar", makeAny(Reference<ui::XSidebar>(static_cast<ui::XSidebar*>(this)))); + if (bWantsCanvas) + { + Reference<rendering::XSpriteCanvas> xCanvas (VCLUnoHelper::GetWindow(rxWindow)->GetSpriteCanvas()); + aCreationArguments.put("Canvas", makeAny(xCanvas)); + } Reference<ui::XUIElement> xUIElement( xUIElementFactory->createUIElement( diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index e6dcf10..dc02aaa 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -128,7 +128,8 @@ private: const ResourceManager::PanelContextDescriptorContainer& rRequestedPanels); cssu::Reference<css::ui::XUIElement> CreateUIElement ( const cssu::Reference<css::awt::XWindowPeer>& rxWindow, - const ::rtl::OUString& rsImplementationURL); + const ::rtl::OUString& rsImplementationURL, + const bool bWantsCanvas); SharedPanel CreatePanel ( const ::rtl::OUString& rsPanelId, ::Window* pParentWindow, _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
