[Libreoffice-commits] core.git: include/svx svx/source
Stephan Bergmann
sbergman at redhat.com
Fri Jul 24 03:18:44 PDT 2015
include/svx/dlgctl3d.hxx | 2 --
include/svx/fontworkgallery.hxx | 1 -
include/svx/pagectrl.hxx | 3 ---
svx/source/accessibility/svxpixelctlaccessiblecontext.cxx | 10 ----------
svx/source/dialog/dlgctl3d.cxx | 2 --
svx/source/dialog/pagectrl.cxx | 5 +----
svx/source/inc/svxpixelctlaccessiblecontext.hxx | 2 --
svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 5 -----
svx/source/tbxctrls/fontworkgallery.cxx | 1 -
9 files changed, 1 insertion(+), 30 deletions(-)
New commits:
commit 6246755d1cd82a66669a16509dd766c1a8b80e8e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Jul 24 12:16:33 2015 +0200
-Werror,-Wunused-private-field
Change-Id: Ib32a73e4f74ce7ccd19327ecaed84c16b5c60779
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index c6f5315..669154b 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -66,8 +66,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewControl
{
// Callback for interactive changes
- Link<> maUserInteractiveChangeCallback;
- Link<> maUserSelectionChangeCallback;
Link<> maChangeCallback;
Link<> maSelectionChangeCallback;
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index b415f35..f570f82 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -68,7 +68,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog
sal_uInt16 mnThemeId;
SdrView* mpSdrView;
- FmFormModel* mpModel;
DECL_LINK( DoubleClickFavoriteHdl, void * );
DECL_LINK( ClickOKHdl, void * );
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 3d7475b..7fb124a 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -68,9 +68,6 @@ private:
sal_uInt16 eUsage;
- OUString aLeftText;
- OUString aRightText;
-
protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index 5357656..70dab35 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -482,19 +482,11 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,bool bSelect ,bool bCheck)
uno::Reference<XAccessible> SvxPixelCtlAccessible::CreateChild (long nIndex,Point mPoint)
{
- long nX = mPoint.X();
- long nY = mPoint.Y();
- if( AllSettings::GetLayoutRTL())
- {
- nX = (sal_uInt16) mrPixelCtl.GetWidth() - 1 - nX;
- }
-
bool bPixelColorOrBG = mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)) != 0;
Size size(mrPixelCtl.GetWidth() / mrPixelCtl.GetLineCount(),mrPixelCtl.GetHeight() / mrPixelCtl.GetLineCount());
uno::Reference<XAccessible> xChild;
xChild = new SvxPixelCtlAccessibleChild(mrPixelCtl,
bPixelColorOrBG,
- Point(nX,nY),
Rectangle(mPoint,size),
this,
nIndex);
@@ -557,7 +549,6 @@ void SvxPixelCtlAccessibleChild::FireAccessibleEvent (
SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
bool bPixelColorOrBG,
- const Point &aPoint,
const Rectangle& rBoundingBox,
const uno::Reference<XAccessible>& rxParent,
long nIndexInParent ) :
@@ -565,7 +556,6 @@ SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
mrParentWindow( rWindow ),
mxParent(rxParent),
m_bPixelColorOrBG(bPixelColorOrBG),
- maPoint(aPoint),
mpBoundingBox( new Rectangle( rBoundingBox ) ),
mnIndexInParent( nIndexInParent ),
mnClientId( 0 )
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index b4b8bea..37d0b6e 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -252,8 +252,6 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr )
Svx3DLightControl::Svx3DLightControl(vcl::Window* pParent, WinBits nStyle)
: Svx3DPreviewControl(pParent, nStyle),
- maUserInteractiveChangeCallback(),
- maUserSelectionChangeCallback(),
maChangeCallback(),
maSelectionChangeCallback(),
maSelectedLight(NO_LIGHT_SELECTED),
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index ed61268..2e73bef 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -73,10 +73,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)
bTable(false),
bHorz(false),
bVert(false),
- eUsage(SVX_PAGE_ALL),
-
- aLeftText(),
- aRightText()
+ eUsage(SVX_PAGE_ALL)
{
// Count in Twips by default
SetMapMode(MapMode(MAP_TWIP));
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index c64309a..c67ad53 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -71,7 +71,6 @@ class SvxPixelCtlAccessibleChild :
SvxPixelCtl& mrParentWindow;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
- Point maPoint;
Rectangle* mpBoundingBox;
/// index of child in parent
long mnIndexInParent;
@@ -81,7 +80,6 @@ public:
SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow,
bool bPixelColorOrBG,
- const Point& aPoint,
const Rectangle& rBounds,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xParent,
long nIndexInParent );
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 87064e0..f2b6260 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -84,11 +84,6 @@ private:
::sfx2::sidebar::ControllerItem maGammaControl;
::sfx2::sidebar::ControllerItem maModeControl;
- OUString msNormal;
- OUString msBW;
- OUString msGray;
- OUString msWater;
-
css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings;
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 191c9a8..aefc47d 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -73,7 +73,6 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP
ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ),
mnThemeId ( 0xffff ),
mpSdrView ( pSdrView ),
- mpModel ( static_cast<FmFormModel*>(pSdrView->GetModel()) ),
mppSdrObject ( NULL ),
mpDestModel ( NULL )
{
More information about the Libreoffice-commits
mailing list