summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-01-27 11:23:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-01-27 11:23:31 +0000
commit34b5dc33d450661bcd9c9f474ed18df8e98634ba (patch)
tree019fe77b89bf0582cc7af24d5118e22067d79d1c /cui
parent02dd8a0e32464aaab863c558322af67b7ba4e121 (diff)
WaE: gcc 4.6.0 various warnings
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/cfg.cxx1
-rw-r--r--cui/source/dialogs/cuicharmap.cxx1
-rw-r--r--cui/source/options/optcolor.cxx2
-rw-r--r--cui/source/options/optfltr.cxx4
-rw-r--r--cui/source/tabpages/border.cxx1
-rw-r--r--cui/source/tabpages/chardlg.cxx4
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx24
7 files changed, 0 insertions, 37 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 14087c3c5659..43b9ad6cf4d4 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5975,7 +5975,6 @@ BitmapEx SvxIconSelectorDialog::AutoScaleBitmap(BitmapEx & aBitmap, const long a
imgposY = (aStandardSize - imgOldHeight) / 2 + 0.5;
}
- Size aBmpSize = aRet.GetSizePixel();
Size aStdSize( aStandardSize, aStandardSize );
Rectangle aRect(aEmptyPoint, aStdSize );
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 93ce5e7ca44e..3b86d30a976f 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -349,7 +349,6 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
// left align aShowText field
int nLeftEdge = aSymbolText.GetPosPixel().X();
nLeftEdge += aSymbolText.GetTextWidth( aSymbolText.GetText() );
- Size aNewSize = aShowText.GetOutputSizePixel();
aShowText.SetPosPixel( Point( nLeftEdge+4, aShowText.GetPosPixel().Y() ) );
}
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index f9eebcca1c28..d55b4cc81c05 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -703,8 +703,6 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
sal_Int32 nHeight = LogicToPixel( Size( 0, _LINE_HEIGHT ), MAP_APPFONT ).Height();
sal_Int32 nLineNum = nLastY / nHeight;
- Point aFixedPos = LogicToPixel( Point( _FT_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT );
- Point aLBPos = LogicToPixel( Point( _LB_XPOS, nLineNum * _LINE_HEIGHT ), MAP_APPFONT );
Size aFixedSize = LogicToPixel( Size( _FT_WIDTH , _FT_HEIGHT ), MAP_APPFONT );
Size aLBSize = LogicToPixel( Size( _LB_WIDTH , _LB_HEIGHT ), MAP_APPFONT );
Size aWinSize = LogicToPixel( Size( _WN_WIDTH , _WN_HEIGHT ), MAP_APPFONT );
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 8e35b22a028b..13e7489f8aac 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -188,7 +188,6 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{
- BOOL bModified = FALSE;
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
static struct ChkCBoxEntries{
@@ -231,10 +230,7 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
pCheckButtonData->ConvertToButtonState( nButtonFlags );
if( bCheck != (pOpt->*pArr->FnIs)() )
- {
- bModified = TRUE;
(pOpt->*pArr->FnSet)( bCheck );
- }
}
}
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 7ac6acad9278..b3dcca434380 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -450,7 +450,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
const SvxBoxInfoItem* pBoxInfoItem;
USHORT nWhichBox = GetWhich(SID_ATTR_BORDER_OUTER);
SfxMapUnit eCoreUnit;
- const Color aColBlack = RGBCOL(COL_BLACK);
pBoxItem = (const SvxBoxItem*)GetItem( rSet, SID_ATTR_BORDER_OUTER );
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 97bcd96954fd..c0f039704e0e 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -980,7 +980,6 @@ void SvxCharNamePage::FillSizeBox_Impl( const FontNameBox* pNameBox )
void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp )
{
- FixedText* pNameLabel = NULL;
FontNameBox* pNameBox = NULL;
FixedText* pStyleLabel = NULL;
FontStyleBox* pStyleBox = NULL;
@@ -993,7 +992,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
switch ( eLangGrp )
{
case Western :
- pNameLabel = m_pWestFontNameFT;
pNameBox = m_pWestFontNameLB;
pStyleLabel = m_pWestFontStyleFT;
pStyleBox = m_pWestFontStyleLB;
@@ -1005,7 +1003,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
break;
case Asian :
- pNameLabel = m_pEastFontNameFT;
pNameBox = m_pEastFontNameLB;
pStyleLabel = m_pEastFontStyleFT;
pStyleBox = m_pEastFontStyleLB;
@@ -1017,7 +1014,6 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
break;
case Ctl :
- pNameLabel = m_pCTLFontNameFT;
pNameBox = m_pCTLFontNameLB;
pStyleLabel = m_pCTLFontStyleFT;
pStyleBox = m_pCTLFontStyleLB;
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 41df6a759ec8..0fb9515ff0f7 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1889,30 +1889,6 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView )
}
else
m_bIsMultiSelection = true;
-
- // use page offset and recalculate
- Point aPt( m_pSdrView->GetSdrPageView()->GetPageOrigin() );
-
- // Massstab
- Fraction aUIScale = m_pSdrView->GetModel()->GetUIScale();
-
-// lcl_ScaleRect( m_aWorkArea, aUIScale );
-// lcl_ScaleRect( m_aRect, aUIScale );
-// lcl_ScalePoint( aPt, aUIScale );
-
- // Metrik konvertieren
-// int nDigits = maMtrPosX.GetDecimalDigits();
-
-// aPt = lcl_ConvertPoint( aPt, nDigits, (MapUnit) mePoolUnit, meDlgUnit );
-// m_aWorkArea = lcl_ConvertRect( m_aWorkArea, nDigits, (MapUnit) mePoolUnit, meDlgUnit );
-// m_aRect = lcl_ConvertRect( m_aRect, nDigits, (MapUnit) mePoolUnit, meDlgUnit );
-
- // use page offset
-// aPt *= -1;
-// aPt += m_aWorkArea.TopLeft();
-// m_aWorkArea.SetPos( aPt );
-
- //SetMinMaxPosition();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */