Kaydet (Commit) 6246755d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

-Werror,-Wunused-private-field

Change-Id: Ib32a73e4f74ce7ccd19327ecaed84c16b5c60779
üst 6c853a98
...@@ -66,8 +66,6 @@ public: ...@@ -66,8 +66,6 @@ public:
class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewControl class SVX_DLLPUBLIC SAL_WARN_UNUSED Svx3DLightControl : public Svx3DPreviewControl
{ {
// Callback for interactive changes // Callback for interactive changes
Link<> maUserInteractiveChangeCallback;
Link<> maUserSelectionChangeCallback;
Link<> maChangeCallback; Link<> maChangeCallback;
Link<> maSelectionChangeCallback; Link<> maSelectionChangeCallback;
......
...@@ -68,7 +68,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog ...@@ -68,7 +68,6 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED FontWorkGalleryDialog : public ModalDialog
sal_uInt16 mnThemeId; sal_uInt16 mnThemeId;
SdrView* mpSdrView; SdrView* mpSdrView;
FmFormModel* mpModel;
DECL_LINK( DoubleClickFavoriteHdl, void * ); DECL_LINK( DoubleClickFavoriteHdl, void * );
DECL_LINK( ClickOKHdl, void * ); DECL_LINK( ClickOKHdl, void * );
......
...@@ -68,9 +68,6 @@ private: ...@@ -68,9 +68,6 @@ private:
sal_uInt16 eUsage; sal_uInt16 eUsage;
OUString aLeftText;
OUString aRightText;
protected: protected:
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
......
...@@ -482,19 +482,11 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,bool bSelect ,bool bCheck) ...@@ -482,19 +482,11 @@ void SvxPixelCtlAccessible::NotifyChild(long nIndex,bool bSelect ,bool bCheck)
uno::Reference<XAccessible> SvxPixelCtlAccessible::CreateChild (long nIndex,Point mPoint) 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; bool bPixelColorOrBG = mrPixelCtl.GetBitmapPixel(sal_uInt16(nIndex)) != 0;
Size size(mrPixelCtl.GetWidth() / mrPixelCtl.GetLineCount(),mrPixelCtl.GetHeight() / mrPixelCtl.GetLineCount()); Size size(mrPixelCtl.GetWidth() / mrPixelCtl.GetLineCount(),mrPixelCtl.GetHeight() / mrPixelCtl.GetLineCount());
uno::Reference<XAccessible> xChild; uno::Reference<XAccessible> xChild;
xChild = new SvxPixelCtlAccessibleChild(mrPixelCtl, xChild = new SvxPixelCtlAccessibleChild(mrPixelCtl,
bPixelColorOrBG, bPixelColorOrBG,
Point(nX,nY),
Rectangle(mPoint,size), Rectangle(mPoint,size),
this, this,
nIndex); nIndex);
...@@ -557,7 +549,6 @@ void SvxPixelCtlAccessibleChild::FireAccessibleEvent ( ...@@ -557,7 +549,6 @@ void SvxPixelCtlAccessibleChild::FireAccessibleEvent (
SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild( SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow, SvxPixelCtl& rWindow,
bool bPixelColorOrBG, bool bPixelColorOrBG,
const Point &aPoint,
const Rectangle& rBoundingBox, const Rectangle& rBoundingBox,
const uno::Reference<XAccessible>& rxParent, const uno::Reference<XAccessible>& rxParent,
long nIndexInParent ) : long nIndexInParent ) :
...@@ -565,7 +556,6 @@ SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild( ...@@ -565,7 +556,6 @@ SvxPixelCtlAccessibleChild::SvxPixelCtlAccessibleChild(
mrParentWindow( rWindow ), mrParentWindow( rWindow ),
mxParent(rxParent), mxParent(rxParent),
m_bPixelColorOrBG(bPixelColorOrBG), m_bPixelColorOrBG(bPixelColorOrBG),
maPoint(aPoint),
mpBoundingBox( new Rectangle( rBoundingBox ) ), mpBoundingBox( new Rectangle( rBoundingBox ) ),
mnIndexInParent( nIndexInParent ), mnIndexInParent( nIndexInParent ),
mnClientId( 0 ) mnClientId( 0 )
......
...@@ -252,8 +252,6 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr ) ...@@ -252,8 +252,6 @@ void Svx3DPreviewControl::Set3DAttributes( const SfxItemSet& rAttr )
Svx3DLightControl::Svx3DLightControl(vcl::Window* pParent, WinBits nStyle) Svx3DLightControl::Svx3DLightControl(vcl::Window* pParent, WinBits nStyle)
: Svx3DPreviewControl(pParent, nStyle), : Svx3DPreviewControl(pParent, nStyle),
maUserInteractiveChangeCallback(),
maUserSelectionChangeCallback(),
maChangeCallback(), maChangeCallback(),
maSelectionChangeCallback(), maSelectionChangeCallback(),
maSelectedLight(NO_LIGHT_SELECTED), maSelectedLight(NO_LIGHT_SELECTED),
......
...@@ -73,10 +73,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent) ...@@ -73,10 +73,7 @@ SvxPageWindow::SvxPageWindow(vcl::Window* pParent)
bTable(false), bTable(false),
bHorz(false), bHorz(false),
bVert(false), bVert(false),
eUsage(SVX_PAGE_ALL), eUsage(SVX_PAGE_ALL)
aLeftText(),
aRightText()
{ {
// Count in Twips by default // Count in Twips by default
SetMapMode(MapMode(MAP_TWIP)); SetMapMode(MapMode(MAP_TWIP));
......
...@@ -71,7 +71,6 @@ class SvxPixelCtlAccessibleChild : ...@@ -71,7 +71,6 @@ class SvxPixelCtlAccessibleChild :
SvxPixelCtl& mrParentWindow; SvxPixelCtl& mrParentWindow;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxParent;
bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color bool m_bPixelColorOrBG;//Pixel Color Or BackGround Color
Point maPoint;
Rectangle* mpBoundingBox; Rectangle* mpBoundingBox;
/// index of child in parent /// index of child in parent
long mnIndexInParent; long mnIndexInParent;
...@@ -81,7 +80,6 @@ public: ...@@ -81,7 +80,6 @@ public:
SvxPixelCtlAccessibleChild( SvxPixelCtlAccessibleChild(
SvxPixelCtl& rWindow, SvxPixelCtl& rWindow,
bool bPixelColorOrBG, bool bPixelColorOrBG,
const Point& aPoint,
const Rectangle& rBounds, const Rectangle& rBounds,
const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xParent, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xParent,
long nIndexInParent ); long nIndexInParent );
......
...@@ -84,11 +84,6 @@ private: ...@@ -84,11 +84,6 @@ private:
::sfx2::sidebar::ControllerItem maGammaControl; ::sfx2::sidebar::ControllerItem maGammaControl;
::sfx2::sidebar::ControllerItem maModeControl; ::sfx2::sidebar::ControllerItem maModeControl;
OUString msNormal;
OUString msBW;
OUString msGray;
OUString msWater;
css::uno::Reference<css::frame::XFrame> mxFrame; css::uno::Reference<css::frame::XFrame> mxFrame;
SfxBindings* mpBindings; SfxBindings* mpBindings;
......
...@@ -73,7 +73,6 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP ...@@ -73,7 +73,6 @@ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, vcl::Window* pP
ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ), ModalDialog(pParent, "FontworkGalleryDialog", "svx/ui/fontworkgallerydialog.ui" ),
mnThemeId ( 0xffff ), mnThemeId ( 0xffff ),
mpSdrView ( pSdrView ), mpSdrView ( pSdrView ),
mpModel ( static_cast<FmFormModel*>(pSdrView->GetModel()) ),
mppSdrObject ( NULL ), mppSdrObject ( NULL ),
mpDestModel ( NULL ) mpDestModel ( NULL )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment