[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 25 commits - sc/source sd/source sfx2/source svx/source sw/source
Pavel JanÃk
paveljanik at apache.org
Wed Apr 10 17:07:10 PDT 2013
sc/source/ui/drawfunc/drawsh5.cxx | 1
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/drtxtob2.cxx | 1
sc/source/ui/view/formatsh.cxx | 6 +-
sd/source/ui/sidebar/PreviewValueSet.cxx | 3 -
sd/source/ui/view/drviews6.cxx | 1
sd/source/ui/view/drviews7.cxx | 2
sfx2/source/sidebar/ContextList.cxx | 5 --
sfx2/source/sidebar/CustomImageRadioButton.cxx | 2
sfx2/source/sidebar/DeckLayouter.cxx | 4 -
sfx2/source/sidebar/FocusManager.cxx | 8 +--
svx/source/dialog/dlgctrl.cxx | 8 +--
svx/source/gallery2/GalleryControl.cxx | 10 ++--
svx/source/sidebar/area/AreaTransparencyGradientControl.cxx | 10 ++--
svx/source/sidebar/debug/ColorPanel.cxx | 2
svx/source/sidebar/debug/ContextPanel.cxx | 2
svx/source/sidebar/graphic/GraphicPropertyPanel.cxx | 2
svx/source/sidebar/line/LinePropertyPanel.cxx | 2
svx/source/sidebar/line/LineStyleValueSet.cxx | 2
svx/source/sidebar/nbdtmgfact.cxx | 2
svx/source/sidebar/paragraph/ParaBulletsControl.cxx | 6 +-
svx/source/sidebar/text/TextPropertyPanel.cxx | 12 ++---
svx/source/sidebar/tools/ValueSetWithTextControl.cxx | 2
svx/source/xoutdev/xtabdash.cxx | 26 +++++++++---
svx/source/xoutdev/xtable.cxx | 2
sw/source/ui/shells/drawsh.cxx | 1
sw/source/ui/shells/drwbassh.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 3 -
28 files changed, 65 insertions(+), 64 deletions(-)
New commits:
commit 3df015016a9a4da6feab35f5a35055d7856a26bb
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:39:03 2013 +0000
Reorder initializations properly to prevent WaE issues.
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
index 5f14ad2..01beb2e 100755
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.cxx
@@ -38,11 +38,11 @@ namespace svx { namespace sidebar {
ParaBulletsControl::ParaBulletsControl(Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel):
PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_BULLETS)),
- mrParaPropertyPanel(rPanel),
- mpBindings(NULL),
maBulletsVS(this,SVX_RES(VS_VALUES)),
maFISep(this,SVX_RES(IMG_SEPERATOR_BULLET)),
- maMoreButton(this,SVX_RES(CB_BULLET_MORE))
+ maMoreButton(this,SVX_RES(CB_BULLET_MORE)),
+ mrParaPropertyPanel(rPanel),
+ mpBindings(NULL)
{
FreeResource();
mpBindings = mrParaPropertyPanel.GetBindings();
commit 77885cab0fad53dda42712d6a8341ecf62870c0c
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:38:24 2013 +0000
Add empty return to prevent WaE issue.
diff --git a/svx/source/sidebar/nbdtmgfact.cxx b/svx/source/sidebar/nbdtmgfact.cxx
index b9f351d..e57d406 100755
--- a/svx/source/sidebar/nbdtmgfact.cxx
+++ b/svx/source/sidebar/nbdtmgfact.cxx
@@ -46,6 +46,8 @@ NBOTypeMgrBase* NBOutlineTypeMgrFact::CreateInstance(const NBOType aType)
{
return OutlineTypeMgr::GetInstance();
}
+
+ return NULL;
}
}}
commit d6c6733a76a93102d9d30efe579834354b02a117
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:37:43 2013 +0000
Unname unused argument to prevent WaE issues.
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index f0b46e2..1209ea6 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -174,7 +174,7 @@ IMPL_LINK( GraphicPropertyPanel, ModifyTransHdl, void *, EMPTYARG )
//////////////////////////////////////////////////////////////////////////////
-IMPL_LINK( GraphicPropertyPanel, ClickColorModeHdl, ToolBox *, pBox )
+IMPL_LINK( GraphicPropertyPanel, ClickColorModeHdl, ToolBox *, /* pBox */)
{
sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos();
SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans );
commit b143faff7117992206dfbc2d5736b48658e2d02c
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:37:15 2013 +0000
Unname unused argument to prevent WaE issues.
diff --git a/svx/source/sidebar/debug/ContextPanel.cxx b/svx/source/sidebar/debug/ContextPanel.cxx
index d101bc3..4d2098e 100644
--- a/svx/source/sidebar/debug/ContextPanel.cxx
+++ b/svx/source/sidebar/debug/ContextPanel.cxx
@@ -48,7 +48,7 @@ ContextPanel::~ContextPanel (void)
-sal_Int32 ContextPanel::GetPreferredHeight (sal_Int32 nWidth)
+sal_Int32 ContextPanel::GetPreferredHeight (sal_Int32 /* nWidth */)
{
const sal_Int32 nHeight (maContextName.GetPosPixel().Y() + maContextName.GetSizePixel().Height() + 5);
return nHeight;
commit 22de8845c1d014c58a668c186187d272d2899f00
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:36:49 2013 +0000
Comment out unused variable to prevent WaE issue.
diff --git a/svx/source/sidebar/line/LineStyleValueSet.cxx b/svx/source/sidebar/line/LineStyleValueSet.cxx
index 7400c7c..2052ad8 100644
--- a/svx/source/sidebar/line/LineStyleValueSet.cxx
+++ b/svx/source/sidebar/line/LineStyleValueSet.cxx
@@ -62,7 +62,7 @@ void LineStyleValueSet::UserDraw( const UserDrawEvent& rUDEvt )
sal_uInt16 nItemId = rUDEvt.GetItemId();
long nRectHeight = aRect.GetHeight();
- long nRectWidth = aRect.GetWidth();
+ // long nRectWidth = aRect.GetWidth();
Point aBLPos = aRect.TopLeft();
if(nItemId == 1)
{
commit cd512b39a6a0441185baea4ddc923354f912cc50
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:36:10 2013 +0000
Unname unused argument to prevent WaE issues.
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 52b3c5f..e6234b6 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -736,7 +736,7 @@ IMPL_LINK(LinePropertyPanel, ToolboxColorSelectHdl,ToolBox*, pToolBox)
-IMPL_LINK(LinePropertyPanel, ChangeLineStyleHdl, ToolBox*, pToolBox)
+IMPL_LINK(LinePropertyPanel, ChangeLineStyleHdl, ToolBox*, /* pToolBox */)
{
const sal_uInt16 nPos(mpLBStyle->GetSelectEntryPos());
commit d1239db83c794302a7369fb19790e75e32322791
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:35:32 2013 +0000
Unname unused arguments and reorder initializations properly to prevent
WaE issues.
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index cf77632..1b82e86 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -194,10 +194,6 @@ TextPropertyPanel::TextPropertyPanel (
mpToolBoxHighlight(ControlFactory::CreateToolBox(
mpToolBoxHighlightBackground.get(),
SVX_RES(TB_HIGHLIGHT))),
- maCharSpacePopup(this, ::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
- maFontColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateFontColorPopupControl, this, _1)),
- maBrushColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateBrushColorPopupControl, this, _1)),
- maUnderlinePopup(this, ::boost::bind(&TextPropertyPanel::CreateUnderlinePopupControl, this, _1)),
mpFontColorUpdater(),
mpHighlightUpdater(),
@@ -246,6 +242,10 @@ TextPropertyPanel::TextPropertyPanel (
mpFontList (NULL),
mbMustDelete (false),
mbFocusOnFontSizeCtrl(false),
+ maCharSpacePopup(this, ::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
+ maUnderlinePopup(this, ::boost::bind(&TextPropertyPanel::CreateUnderlinePopupControl, this, _1)),
+ maFontColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateFontColorPopupControl, this, _1)),
+ maBrushColorPopup(this, ::boost::bind(&TextPropertyPanel::CreateBrushColorPopupControl, this, _1)),
mxFrame(rxFrame),
maContext(),
mpBindings(pBindings),
@@ -1556,7 +1556,7 @@ Color TextPropertyPanel::GetFontColor (void) const
}
void TextPropertyPanel::SetFontColor (
- const String& rsColorName,
+ const String& /* rsColorName */,
const Color aColor)
{
SvxColorItem aColorItem(aColor, SID_ATTR_CHAR_COLOR);
@@ -1570,7 +1570,7 @@ Color TextPropertyPanel::GetBrushColor (void) const
}
void TextPropertyPanel::SetBrushColor (
- const String& rsColorName,
+ const String& /* rsColorName */,
const Color aColor)
{
SvxBrushItem aBrushItem(aColor, SID_ATTR_BRUSH_CHAR);
commit 586162a41d2a88e52ad351f196770f02e0fe11a4
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:34:48 2013 +0000
Use proper variable type to prevent comparing signed and unsigned variables (WaE).
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index c2e51b0..d93db4b 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -274,7 +274,7 @@ void SvxNumValueSet2::SetNumberingSettings(
InsertItem( DEFAULT_NONE, DEFAULT_NONE - 1 );
SetItemText( DEFAULT_NONE, SVX_RESSTR( RID_SVXSTR_NUMBULLET_NONE ));
- for ( sal_uInt32 i = 0; i < aNum.getLength(); i++ )
+ for ( sal_Int32 i = 0; i < aNum.getLength(); i++ )
{
InsertItem( i + 1);
if( i < 8 )
commit 67b5bc9fe10c8b491f9f2f2176dc431d4e183e00
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:33:10 2013 +0000
Unname unused argument to prevent WaE issues.
diff --git a/svx/source/sidebar/debug/ColorPanel.cxx b/svx/source/sidebar/debug/ColorPanel.cxx
index 42bf02c..2b2db8c 100644
--- a/svx/source/sidebar/debug/ColorPanel.cxx
+++ b/svx/source/sidebar/debug/ColorPanel.cxx
@@ -130,7 +130,7 @@ int ColorPanel::CalculateRowCount (const Size&, int nColumnCount)
-void ColorPanel::DataChanged (const DataChangedEvent& rEvent)
+void ColorPanel::DataChanged (const DataChangedEvent& /* rEvent */)
{
Fill();
}
commit d7ae79213c004a2ec57d8a8249316a5049c08f62
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:31:46 2013 +0000
Unname unused arguments and reorder initializations properly to prevent
WaE issues.
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index f59f382..6523e56 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -65,14 +65,14 @@ AreaTransparencyGradientControl::AreaTransparencyGradientControl (
maMtrTrgrCenterY(this, SVX_RES(MTR_TRGR_CENTER_Y)),
maFtTrgrAngle(this, SVX_RES(FT_TRGR_ANGLE)),
maMtrTrgrAngle(this, SVX_RES(MTR_TRGR_ANGLE)),
+ maBtnLeft45(this, SVX_RES(BTN_LEFT_SECOND)),
+ maBtnRight45(this, SVX_RES(BTN_RIGHT_FIRST)),
maFtTrgrStartValue(this, SVX_RES(FT_TRGR_START_VALUE)),
maMtrTrgrStartValue(this, SVX_RES(MTR_TRGR_START_VALUE)),
maFtTrgrEndValue(this, SVX_RES(FT_TRGR_END_VALUE)),
maMtrTrgrEndValue(this, SVX_RES(MTR_TRGR_END_VALUE)),
maFtTrgrBorder(this, SVX_RES(FT_TRGR_BORDER)),
maMtrTrgrBorder(this, SVX_RES(MTR_TRGR_BORDER)),
- maBtnLeft45(this, SVX_RES(BTN_LEFT_SECOND)),
- maBtnRight45(this, SVX_RES(BTN_RIGHT_FIRST)),
maRotLeft( SVX_RES(IMG_ROT_LEFT)),
maRotRight( SVX_RES(IMG_ROT_RIGHT)),
mrAreaPropertyPanel(rPanel),
@@ -304,7 +304,7 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s
-IMPL_LINK(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, void *, pControl)
+IMPL_LINK(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, void *, /* pControl */)
{
sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100);
sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100);
@@ -315,7 +315,7 @@ IMPL_LINK(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, void *, pContro
-IMPL_LINK(AreaTransparencyGradientControl, Left_Click45_Impl, void *, pControl)
+IMPL_LINK(AreaTransparencyGradientControl, Left_Click45_Impl, void *, /* pControl */)
{
sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100);
sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100);
@@ -331,7 +331,7 @@ IMPL_LINK(AreaTransparencyGradientControl, Left_Click45_Impl, void *, pControl)
-IMPL_LINK(AreaTransparencyGradientControl, Right_Click45_Impl, void *, pControl)
+IMPL_LINK(AreaTransparencyGradientControl, Right_Click45_Impl, void *, /* pControl */)
{
sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue.GetValue() * 255) / 100);
sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue.GetValue() * 255) / 100);
commit 249ccf1e1a8142a576c0ca013b7bf5ec3e37f83e
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:29:37 2013 +0000
Unname unused argument and reorder initializations properly to prevent
WaE issues.
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index ac84b50..c625642 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -40,20 +40,20 @@ static const sal_Int32 gnInitialVerticalSplitPosition (150);
GalleryControl::GalleryControl (
- SfxBindings* pBindings,
+ SfxBindings* /* pBindings */,
Window* pParentWindow)
: Window(pParentWindow, GAL_RESID(RID_SVXDLG_GALLERYBROWSER)),
mpGallery (Gallery::GetGalleryInstance()),
+ mpSplitter(new GallerySplitter(
+ this,
+ GAL_RESID(GALLERY_SPLITTER),
+ ::boost::bind(&GalleryControl::InitSettings, this))),
mpBrowser1(new GalleryBrowser1(
this,
GAL_RESID(GALLERY_BROWSER1),
mpGallery,
::boost::bind(&GalleryControl::KeyInput,this,_1,_2),
::boost::bind(&GalleryControl::ThemeSelectionHasChanged, this))),
- mpSplitter(new GallerySplitter(
- this,
- GAL_RESID(GALLERY_SPLITTER),
- ::boost::bind(&GalleryControl::InitSettings, this))),
mpBrowser2(new GalleryBrowser2(this, GAL_RESID(GALLERY_BROWSER2), mpGallery)),
maLastSize(GetOutputSizePixel()),
mbIsInitialResize(true)
commit 37b089393ebff04fab44649715d9ac60945660ef
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 18:28:45 2013 +0000
Use proper variable types to prevent comparing signed and unsigned variables (WaE).
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 597ecc2..54e58a3 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -1504,9 +1504,9 @@ void BitmapLB::SetVirtualDevice(const Size& rSize)
{
const Size aBitmapSize(maBitmapEx.GetSizePixel());
- for(sal_uInt32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
+ for(sal_Int32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
{
- for(sal_uInt32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
+ for(sal_Int32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
{
maVD.DrawBitmapEx(
Point(x, y),
@@ -1694,9 +1694,9 @@ void FillAttrLB::SetVirtualDevice(const Size& rSize)
{
const Size aBitmapSize(maBitmapEx.GetSizePixel());
- for(sal_uInt32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
+ for(sal_Int32 y(0); y < rSize.Height(); y += aBitmapSize.Height())
{
- for(sal_uInt32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
+ for(sal_Int32 x(0); x < rSize.Width(); x += aBitmapSize.Width())
{
maVD.DrawBitmapEx(
Point(x, y),
commit 33326b1cbdbbe3126325b47b51c4199c5bd5f808
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 16:51:54 2013 +0000
Comment unused variables and rephrase the spaghetti code to prevent WaE issues.
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index d751bc9..906c50a 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -51,8 +51,8 @@ namespace
return PC_TitleBar;
else if (rPanel.GetTitleBar()->GetToolBox().HasFocus())
return PC_ToolBox;
- else
- return PC_None;
+
+ return PC_None;
}
}
@@ -418,8 +418,8 @@ void FocusManager::HandleKeyEvent (
return;
const sal_Int32 nPanelIndex (GetPanelIndex(rWindow));
- const bool bIsPanelTitleFocused (nPanelIndex>=0 && maPanels[nPanelIndex] != &rWindow);
- const bool bIsPanelToolBoxFocused (nPanelIndex>=0 && maPanels[nPanelIndex] != &rWindow);
+ // const bool bIsPanelTitleFocused (nPanelIndex>=0 && maPanels[nPanelIndex] != &rWindow);
+ // const bool bIsPanelToolBoxFocused (nPanelIndex>=0 && maPanels[nPanelIndex] != &rWindow);
sal_Int32 nButtonIndex (nPanelIndex==-1 ? GetButtonIndex(rWindow) : -1);
switch (rKeyCode.GetCode())
commit 96dc332eb67f30659b226adcb8966ae8cbb34448
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 16:50:55 2013 +0000
Comment unused variables to prevent WaE issues.
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx b/sfx2/source/sidebar/DeckLayouter.cxx
index 5f68946..9e5ec88 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -98,11 +98,11 @@ Rectangle DeckLayouter::LayoutPanels (
Rectangle aBox (PlaceVerticalScrollBar(rVerticalScrollBar, aContentArea, bShowVerticalScrollBar));
const sal_Int32 nWidth (aBox.GetWidth());
- const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight));
+ // const sal_Int32 nPanelTitleBarHeight (Theme::GetInteger(Theme::Int_PanelTitleBarHeight));
// Prepare the separators, horizontal lines above and below the
// panel titels.
- const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight));
+ // const sal_Int32 nDeckSeparatorHeight (Theme::GetInteger(Theme::Int_DeckSeparatorHeight));
// Get the requested heights of the panels and the available
// height that is left when all panel titles and separators are
commit 9e31755e5f2a8947a10d5300c48287a0b7937081
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 16:50:16 2013 +0000
Unname unused argument to prevent WaE issues.
diff --git a/sfx2/source/sidebar/CustomImageRadioButton.cxx b/sfx2/source/sidebar/CustomImageRadioButton.cxx
index ed838ee..7f1fccc 100644
--- a/sfx2/source/sidebar/CustomImageRadioButton.cxx
+++ b/sfx2/source/sidebar/CustomImageRadioButton.cxx
@@ -48,7 +48,7 @@ CustomImageRadioButton::~CustomImageRadioButton (void)
}
-void CustomImageRadioButton::Paint (const Rectangle& rUpdateArea)
+void CustomImageRadioButton::Paint (const Rectangle& /* rUpdateArea */)
{
Rectangle aPaintRect( Rectangle(Point(0,0), GetSizePixel() ) );
SetMouseRect( aPaintRect );
commit 2d094b94137e767922af40a2ecf22176d25b0513
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 16:43:27 2013 +0000
Remove unused variable to prevent WaE.
diff --git a/sfx2/source/sidebar/ContextList.cxx b/sfx2/source/sidebar/ContextList.cxx
index ebcda27..ee17b78 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -28,11 +28,6 @@ using ::rtl::OUString;
namespace sfx2 { namespace sidebar {
-namespace {
- static const sal_Char* gsAny = "any";
-}
-
-
ContextList::ContextList (void)
: maEntries()
commit 35f96c967abb1a8b4723c7261c253661d409732c
Author: Armin Le Grand <alg at apache.org>
Date: Wed Apr 10 15:51:45 2013 +0000
i121791 Enhanced look of the LineStyle previews
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3ae3eb7..043f1a1 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -103,6 +103,10 @@ public:
SdrObject* getLineObject() const { return mpLineObject; }
};
+// to avoid rendering trouble (e.g. vcl renderer) and to get better AAed quality,
+// use double prerender size
+static bool bUseDoubleSize = true;
+
void XDashList::impCreate()
{
if(!mpData)
@@ -113,7 +117,9 @@ void XDashList::impCreate()
VirtualDevice* pVirDev = new VirtualDevice;
OSL_ENSURE(0 != pVirDev, "XDashList: no VirtualDevice created!" );
pVirDev->SetMapMode(MAP_100TH_MM);
- const Size aSize(pVirDev->PixelToLogic(Size(getUiBitmapWidth() * 2, getUiBitmapHeight())));
+ const Size aSize(pVirDev->PixelToLogic(Size(
+ bUseDoubleSize ? getUiBitmapWidth() * 5 : getUiBitmapWidth() * 5 / 2,
+ bUseDoubleSize ? getUiBitmapHeight() * 2 : getUiBitmapHeight())));
pVirDev->SetOutputSize(aSize);
pVirDev->SetDrawMode(rStyleSettings.GetHighContrastMode()
? DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT
@@ -132,8 +138,9 @@ void XDashList::impCreate()
pBackgroundObject->SetMergedItem(XLineStyleItem(XLINE_NONE));
pBackgroundObject->SetMergedItem(XFillColorItem(String(), rStyleSettings.GetFieldColor()));
- const basegfx::B2DPoint aStart(0, aSize.Height() / 2);
- const basegfx::B2DPoint aEnd(aSize.Width(), aSize.Height() / 2);
+ const sal_uInt32 nHalfHeight(aSize.Height() / 2);
+ const basegfx::B2DPoint aStart(0, nHalfHeight);
+ const basegfx::B2DPoint aEnd(aSize.Width(), nHalfHeight);
basegfx::B2DPolygon aPolygon;
aPolygon.append(aStart);
aPolygon.append(aEnd);
@@ -143,7 +150,7 @@ void XDashList::impCreate()
pLineObject->SetMergedItem(XLineStyleItem(XLINE_DASH));
pLineObject->SetMergedItem(XLineColorItem(String(), rStyleSettings.GetFieldTextColor()));
const Size aLineWidth(pVirDev->PixelToLogic(Size(getUiBitmapLineWidth(), 0)));
- pLineObject->SetMergedItem(XLineWidthItem(aLineWidth.getWidth()));
+ pLineObject->SetMergedItem(XLineWidthItem(bUseDoubleSize ? aLineWidth.getWidth() * 2 : aLineWidth.getWidth()));
mpData = new impXDashList(pVirDev, pSdrModel, pBackgroundObject, pLineObject);
OSL_ENSURE(0 != mpData, "XDashList: data creation went wrong!" );
}
@@ -273,7 +280,16 @@ Bitmap XDashList::ImpCreateBitmapForXDash(const XDash* pDash)
aPainter.ProcessDisplay(aDisplayInfo);
const Point aZero(0, 0);
- return pVD->GetBitmap(aZero, pVD->GetOutputSize());
+ Bitmap aResult(pVD->GetBitmap(aZero, pVD->GetOutputSize()));
+
+ if(bUseDoubleSize)
+ {
+ const Size aCurrentSize(aResult.GetSizePixel());
+
+ aResult.Scale(Size(aCurrentSize.Width() / 2, aCurrentSize.Height() / 2), BMP_SCALE_FASTESTINTERPOLATE);
+ }
+
+ return aResult;
}
Bitmap XDashList::CreateBitmapForUI( long nIndex )
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index ba1d875..775e0a1 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -226,7 +226,7 @@ sal_uInt32 XPropertyList::getUiBitmapHeight() const
sal_uInt32 XPropertyList::getUiBitmapLineWidth() const
{
- static sal_uInt32 nLineWidth = 3;
+ static sal_uInt32 nLineWidth = 1;
return nLineWidth;
}
commit 5e0625694e0ed9f3420ba5da2dbbeacd22a23b2c
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:27:29 2013 +0000
Remove unused variables to prevent WaE issues.
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index f027bf7..4485a37 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -413,7 +413,6 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
- const SfxPoolItem* pItem;
if ( pDrView->IsTextEdit() )
{
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index ead51e7..ed3bc84 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -782,7 +782,7 @@ void SwDrawBaseShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
if( rMarkList.GetMark(0) != 0 )
{
- SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();//OST_IFBX at WL2
+ // SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();//OST_IFBX at WL2
SfxItemSet aNewAttr(pSdrView->GetGeoAttrFromMarked());
rSet.Put(aNewAttr,false);
}
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index 0295fd6..2552472be 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -292,10 +292,9 @@ void SwDrawTextShell::ExecFormText(SfxRequest& rReq)
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
- const SfxPoolItem* pItem;
//ask for the ViewFrame here - "this" may not be valid any longer!
- SfxViewFrame* pVFrame = GetView().GetViewFrame();
+ // SfxViewFrame* pVFrame = GetView().GetViewFrame();
if ( pDrView->IsTextEdit() )
{
//#111733# Sometimes SdrEndTextEdit() initiates the change in selection and
commit 2995aa9239527c57dc72d0fb17d1188029213db0
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:14:46 2013 +0000
Remove unused variables to prevent WaE issues.
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index f8c2981..862a707 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -912,7 +912,6 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
}
else if( nSlot == SID_ATTR_PARA_LINESPACE )
{
- sal_uInt16 nId = SID_ATTR_PARA_LINESPACE;
SvxLineSpacingItem aLineSpaceItem = (const SvxLineSpacingItem&)pArgs->Get(
GetPool().GetWhich(nSlot));
SfxItemSet aEditAttr( GetPool(), EE_PARA_SBL, EE_PARA_SBL );
@@ -925,7 +924,6 @@ void __EXPORT ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
}
else if( nSlot == SID_ATTR_PARA_ULSPACE )
{
- sal_uInt16 nId = SID_ATTR_PARA_ULSPACE;
SvxULSpaceItem aULSpaceItem = (const SvxULSpaceItem&)pArgs->Get(
GetPool().GetWhich(nSlot));
SfxItemSet aEditAttr( GetPool(), EE_PARA_ULSPACE, EE_PARA_ULSPACE );
commit 654259d3d173949a71fc19f22e3d8308d50bf9f7
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:12:23 2013 +0000
Remove unused variable to prevent WaE issues.
diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx
index 66df37c..a4de3bf 100644
--- a/sc/source/ui/drawfunc/drtxtob2.cxx
+++ b/sc/source/ui/drawfunc/drtxtob2.cxx
@@ -200,7 +200,6 @@ void ScDrawTextObjectBar::ExecFormText(SfxRequest& rReq)
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
- const SfxPoolItem* pItem;
if ( pDrView->IsTextEdit() )
pDrView->ScEndTextEdit();
commit d68f83962fb0d4f5e26ef66eaafa119db79a4ec9
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:09:40 2013 +0000
Remove unused variable to prevent WaE issues.
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 3c7907a..c8b78bb 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -680,7 +680,6 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq)
if ( rMarkList.GetMarkCount() == 1 && rReq.GetArgs() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
- const SfxPoolItem* pItem;
if ( pDrView->IsTextEdit() )
pDrView->ScEndTextEdit();
commit fb73c24535b78fd482161175a5962cbe942cbaf8
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:07:47 2013 +0000
Remove unused variable to prevent WaE issues.
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 38176d4..db5d0a7 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -211,8 +211,6 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
void DrawViewShell::GetDrawAttrState(SfxItemSet& rSet)
{
- const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
-
SfxItemSet aSet( mpDrawView->GetGeoAttrFromMarked() );
rSet.Put(aSet,sal_False);
}
commit 8018db50a5d691a4dc58818208fb212e95b1ffe7
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:07:20 2013 +0000
Remove unused variable to prevent WaE issues.
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index daa02e4..8c2bccb 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -101,7 +101,6 @@ void DrawViewShell::ExecFormText(SfxRequest& rReq)
mpDrawView && !mpDrawView->IsPresObjSelected() )
{
const SfxItemSet& rSet = *rReq.GetArgs();
- const SfxPoolItem* pItem;
if ( mpDrawView->IsTextEdit() )
mpDrawView->SdrEndTextEdit();
commit 66c5a00e14de56552a1864f0f04387753d546f0b
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 15:06:51 2013 +0000
Remove unused variables to prevent WaE issues.
diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx
index 556073f..cce4a8f 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.cxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.cxx
@@ -99,9 +99,6 @@ void PreviewValueSet::Resize (void)
void PreviewValueSet::Rearrange (bool bForceRequestResize)
{
- sal_uInt16 nOldColumnCount (GetColCount());
- sal_uInt16 nOldRowCount (GetLineCount());
-
sal_uInt16 nNewColumnCount (CalculateColumnCount (
GetOutputSizePixel().Width()));
sal_uInt16 nNewRowCount (CalculateRowCount (nNewColumnCount));
commit 7324943543aefacf357a527b85c59d4201d2e8ef
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Wed Apr 10 14:58:57 2013 +0000
Comment unused variables to prevent WaE issues.
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 28e39e6..497a239 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1755,7 +1755,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
case SID_ATTR_BORDER_DIAG_TLBR:
case SID_ATTR_BORDER_DIAG_BLTR:
{
- ScDocument* pDoc = GetViewData()->GetDocument();
+ // ScDocument* pDoc = GetViewData()->GetDocument();
const ScPatternAttr* pOldAttrs = pTabViewShell->GetSelectionPattern();
SfxItemSet* pOldSet = new SfxItemSet(pOldAttrs->GetItemSet());
SfxItemSet* pNewSet = new SfxItemSet(pOldAttrs->GetItemSet());
@@ -1841,7 +1841,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
{
ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
- const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine();
+ // const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine();
const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND );
SfxWhichIter aIter( rSet );
sal_uInt16 nWhich = aIter.FirstWhich();
@@ -1881,7 +1881,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet )
// handled together because both need the cell border information for decisions
// rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) );
Color aCol = 0;
- sal_uInt16 nOut = 0, nIn = 0, nDis = 0;
+ // sal_uInt16 nOut = 0, nIn = 0, nDis = 0;
SvxBorderLine aLine(0,0,0,0);
bool bCol = 0;
bool bColDisable = 0, bStyleDisable = 0;
More information about the Libreoffice-commits
mailing list