diff options
Diffstat (limited to 'cui/source/tabpages')
41 files changed, 96 insertions, 417 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 772ee2a27fbb..1dd8ad177119 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include "align.hxx" diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index f89ee9a6ef6a..fd68e1e1f557 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -26,11 +26,9 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define _SVSTDARR_STRINGSISORTDTOR #define _SVSTDARR_STRINGSDTOR + #include <svl/svstdarr.hxx> #include <vcl/msgbox.hxx> #include <vcl/field.hxx> @@ -2127,7 +2125,6 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 )); pMap->SetText(nMode < SGL_END ? sStartQuoteDlg : sEndQuoteDlg ); sal_UCS4 cDlg; - //The two lines below are added by BerryJia for Bug95846 Time:2002-8-13 15:50 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); LanguageType eLang = Application::GetSettings().GetLanguage(); switch( nMode ) @@ -2135,25 +2132,25 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn ) case SGL_START: cDlg = cSglStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',TRUE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'',TRUE,eLang); break; case SGL_END: cDlg = cSglEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\'',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\'',FALSE,eLang); break; case DBL_START: cDlg = cStartQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',TRUE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"',TRUE,eLang); break; case DBL_END: cDlg = cEndQuote; if(cDlg == 0) - cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); //add by BerryJia for Bug95846 Time:2002-8-13 15:50 + cDlg = pAutoCorrect->GetQuote('\"',FALSE,eLang); break; default: - DBG_ERROR("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); + OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" ); cDlg = 0; break; diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 53b31dc575ea..c863435f1476 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -205,7 +205,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY COMMON_CLB_ENTRIES String ST_DEL_EMPTY_PARA { - /* ### ACHTUNG: Neuer Text in Resource? Leere Absätze entfernen : Leere Absõtze entfernen */ Text [ en-US ] = "Remove blank paragraphs" ; }; String ST_USER_STYLE @@ -218,7 +217,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY }; String ST_RIGHT_MARGIN { - /* ### ACHTUNG: Neuer Text in Resource? Zusammenfassen von einzeiligen Absätzen ab : Zusammenfassen von einzeiligen Absõtzen ab */ // Text [ norwegian_wrong ] = "+++Combine single line paragraphs at" ; // Text [ swedish_wrong ] = ~Kombinera enradiga stycken B738vid " ; Text [ en-US ] = "Combine single line paragraphs if length greater than" ; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index bbaaea4dbf72..9225f1c4f679 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <unotools/pathoptions.hxx> #include <vcl/msgbox.hxx> @@ -594,8 +591,8 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet ) } nWhich = GetWhich( SID_ATTR_BRUSH_CHAR ); - SfxItemState eState = rSet.GetItemState( nWhich, TRUE ); - eState = rSet.GetItemState( nWhich, FALSE ); + rSet.GetItemState( nWhich, TRUE ); + rSet.GetItemState( nWhich, FALSE ); if ( rSet.GetItemState( nWhich, TRUE ) > SFX_ITEM_AVAILABLE ) { pBgdAttr = (const SvxBrushItem*)&( rSet.Get( nWhich ) ); diff --git a/cui/source/tabpages/backgrnd.src b/cui/source/tabpages/backgrnd.src index 7f413f116aff..49f2124f8b88 100644 --- a/cui/source/tabpages/backgrnd.src +++ b/cui/source/tabpages/backgrnd.src @@ -71,7 +71,6 @@ TabPage RID_SVXPAGE_BACKGROUND Size = MAP_APPFONT ( 24 , 10 ) ; Hide = TRUE ; LeftLabel = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Fü~r : F³~r */ Text [ en-US ] = "F~or" ; }; ListBox LB_TBL_BOX @@ -203,7 +202,6 @@ TabPage RID_SVXPAGE_BACKGROUND Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 49 , 10 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Fläche : ~Flõche */ Text [ en-US ] = "Ar~ea" ; }; RadioButton BTN_TILE diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx index f688e9b720f5..af6197312dbd 100644 --- a/cui/source/tabpages/bbdlg.cxx +++ b/cui/source/tabpages/bbdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <svx/dialogs.hrc> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 7ac6acad9278..7ca9e34b9098 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -450,7 +447,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/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index 290306176e1c..707af534a6df 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include "borderconn.hxx" #include <svx/frmsel.hxx> #include "editeng/bolnitem.hxx" diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 97bcd96954fd..c41dad92b704 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> @@ -621,6 +618,30 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const SfxItemSet& rInSet ) : m_pColorLB = new ColorListBox( this, CUI_RES( LB_COLOR2 ) ); } + //In MacOSX the standard dialogs name font-name, font-style as + //Family, Typeface + //In GNOME the standard dialogs name font-name, font-style as + //Family, Style + //In Windows the standard dialogs name font-name, font-style as + //Font, Style +#ifdef WNT + String sFontFamilyString(CUI_RES(STR_CHARNAME_FONT)); +#else + String sFontFamilyString(CUI_RES(STR_CHARNAME_FAMILY)); +#endif + m_pWestFontNameFT->SetText(sFontFamilyString); + m_pEastFontNameFT->SetText(sFontFamilyString); + m_pCTLFontNameFT->SetText(sFontFamilyString); + +#ifdef MACOSX + String sFontStyleString(CUI_RES(STR_CHARNAME_TYPEFACE)); +#else + String sFontStyleString(CUI_RES(STR_CHARNAME_STYLE)); +#endif + m_pWestFontStyleFT->SetText(sFontStyleString); + m_pEastFontStyleFT->SetText(sFontStyleString); + m_pCTLFontStyleFT->SetText(sFontStyleString); + m_pWestLine ->Show( bCJK ); m_pColorFL ->Show( bCJK ); @@ -980,7 +1001,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 +1013,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 +1024,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 +1035,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; @@ -2447,7 +2464,6 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet ) m_aUnderlineLB.GetSelectHdl().Call(NULL); // don't call SelectHdl_Impl directly! // in DisableControls, we may have re-reouted the select handler - // 30.05.2001 - 86262 - frank.schoenheit@germany.sun.com // the select handler for the emphasis listbox // SelectHdl_Impl( &m_aEmphasisLB ); diff --git a/cui/source/tabpages/chardlg.hrc b/cui/source/tabpages/chardlg.hrc index 3d12b5f3bd0b..0d583b0431e8 100644 --- a/cui/source/tabpages/chardlg.hrc +++ b/cui/source/tabpages/chardlg.hrc @@ -70,6 +70,10 @@ #define STR_CHARNAME_NOSTYLE 150 #define STR_CHARNAME_TRANSPARENT 151 +#define STR_CHARNAME_FAMILY 152 +#define STR_CHARNAME_FONT 153 +#define STR_CHARNAME_STYLE 154 +#define STR_CHARNAME_TYPEFACE 155 // EffectsPage -------------------------------------------------------------- diff --git a/cui/source/tabpages/chardlg.src b/cui/source/tabpages/chardlg.src index 9673fc950f3f..0d3960fd219c 100644 --- a/cui/source/tabpages/chardlg.src +++ b/cui/source/tabpages/chardlg.src @@ -48,13 +48,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 14 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; FixedText FT_WEST_NAME_NOCJK { Pos = MAP_APPFONT ( 12 , 6 ); Size = MAP_APPFONT ( 112 , 8 ); - Text [ en-US ] = "~Font"; }; ComboBox LB_WEST_NAME { @@ -76,13 +74,11 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 14 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "~Typeface"; }; FixedText FT_WEST_STYLE_NOCJK { Pos = MAP_APPFONT ( 130 , 6 ); Size = MAP_APPFONT ( 72 , 8 ); - Text [ en-US ] = "~Typeface"; }; ComboBox LB_WEST_STYLE { @@ -182,7 +178,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 54 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_EAST_NAME { @@ -196,7 +191,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 54 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "T~ypeface"; }; ComboBox LB_EAST_STYLE { @@ -252,7 +246,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 80 , 8 ); - Text [ en-US ] = "Font"; }; ComboBox LB_CTL_NAME { @@ -266,7 +259,6 @@ TabPage RID_SVXPAGE_CHAR_NAME { Pos = MAP_APPFONT ( 96 , 94 ); Size = MAP_APPFONT ( 40 , 8 ); - Text [ en-US ] = "Ty~peface"; }; ComboBox LB_CTL_STYLE { @@ -353,6 +345,22 @@ TabPage RID_SVXPAGE_CHAR_NAME { Text [ en-US ] = "Transparent"; }; + String STR_CHARNAME_FAMILY + { + Text [ en-US ] = "Family"; + }; + String STR_CHARNAME_FONT + { + Text [ en-US ] = "Font"; + }; + String STR_CHARNAME_STYLE + { + Text [ en-US ] = "Style"; + }; + String STR_CHARNAME_TYPEFACE + { + Text [ en-US ] = "Typeface"; + }; }; // RID_SVXPAGE_CHAR_EFFECTS --------------------------------------------------- diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index 20f448209ec8..5c447b2fc147 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx index cfd7d7327d2c..72b1bf4d6b8d 100644 --- a/cui/source/tabpages/dstribut.cxx +++ b/cui/source/tabpages/dstribut.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <sfx2/basedlgs.hxx> #include <cuires.hrc> #include "dstribut.hxx" diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 85bc19f67daf..2269ecfe051f 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> @@ -470,16 +467,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aLeftMF) { -// nLeft = aPageSize.Width() - -// ((nRight + aOrigSize.Width()) * nWidthZoom) / 100; nLeft = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nRight ); aLeftMF.SetValue( aLeftMF.Normalize( nLeft ), eUnit ); } else { -// nRight = aPageSize.Width() - -// ((nLeft - aOrigSize.Width()) * nWidthZoom) / 100; nRight = aOrigSize.Width() - ( aPageSize.Width() * 100 / nWidthZoom + nLeft ); aRightMF.SetValue( aRightMF.Normalize( nRight ), eUnit ); @@ -503,16 +496,12 @@ IMPL_LINK( SvxGrfCropPage, CropHdl, const MetricField *, pField ) { if(pField == &aTopMF) { -// nTop = aPageSize.Height() - -// ((aOrigSize.Height() - nBottom) * nHeightZoom)/ 100; nTop = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nBottom); aTopMF.SetValue( aWidthMF.Normalize( nTop ), eUnit ); } else { -// nBottom = aPageSize.Height() - -// ((aOrigSize.Height() - nTop)*nHeightZoom) / 100; nBottom = aOrigSize.Height() - ( aPageSize.Height() * 100 / nHeightZoom + nTop); aBottomMF.SetValue( aWidthMF.Normalize( nBottom ), eUnit ); @@ -605,11 +594,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() nMin = nMinWidth - (nL >= 0 ? nL : 0); aRightMF.SetMax( aRightMF.Normalize(nMin), eUnit ); - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Width() * 102) /100; - aLeftMF.SetMax(aPageSize.Width() - nR - nMin); - aRightMF.SetMax(aPageSize.Width() - nL - nMin); -*/ long nUp = lcl_GetValue( aTopMF, eUnit ); long nMinHeight = (aOrigSize.Height() * 10) /11; nMin = nMinHeight - (nUp >= 0 ? nUp : 0); @@ -618,11 +602,6 @@ void SvxGrfCropPage::CalcMinMaxBorder() long nLow = lcl_GetValue(aBottomMF, eUnit ); nMin = nMinHeight - (nLow >= 0 ? nLow : 0); aTopMF.SetMax( aTopMF.Normalize(nMin), eUnit ); - - // Zoom nicht unter 2% -/* nMin = (aOrigSize.Height() * 102) /100; - aTopMF.SetMax(aPageSize.Height() - nLow - nMin); - aBottomMF.SetMax(aPageSize.Height() - nUp - nMin);*/ } /*-------------------------------------------------------------------- Beschreibung: Spinsize auf 1/20 der Originalgroesse setzen, @@ -808,7 +787,4 @@ void SvxGrfCropPage::SvxCropExample::SetFrameSize( const Size& rSz ) Invalidate(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index e63ea5855ce4..411e5f53257b 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/labdlg.src b/cui/source/tabpages/labdlg.src index 05497e59b7a4..36fb0f52d108 100644 --- a/cui/source/tabpages/labdlg.src +++ b/cui/source/tabpages/labdlg.src @@ -149,8 +149,6 @@ TabPage RID_SVXPAGE_CAPTION { Pos = MAP_APPFONT ( 6 , 85 ) ; Size = MAP_APPFONT ( 42 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ - /* ### ACHTUNG: Neuer Text in Resource? ~Länge : ~Lõnge */ Text [ en-US ] = "~Length" ; }; MetricField MF_LAENGE diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx index 49cc40676710..fe8107ef8b85 100644 --- a/cui/source/tabpages/macroass.cxx +++ b/cui/source/tabpages/macroass.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #define ITEMID_MACRO 0 #include <svl/macitem.hxx> #undef ITEMID_MACRO @@ -178,7 +175,7 @@ void _SfxMacroTabPage::EnableButtons( const String& rLangName ) sEventMacro = ((SvLBoxString*)pE->GetItem( LB_MACROS_ITEMPOS ))->GetText(); if ( rLangName.EqualsAscii("JavaScript") ) { - DBG_ERROR( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" ); + OSL_FAIL( "_SfxMacroTabPage::EnableButtons(): this is not an up to date usage!" ); } else { diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src index 4f5d78ffe795..36c4a9115105 100644 --- a/cui/source/tabpages/macroass.src +++ b/cui/source/tabpages/macroass.src @@ -91,7 +91,6 @@ TabPage RID_SVXPAGE_EVENTASSIGN { Pos = MAP_APPFONT ( COL4 , ROW0 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; - // ### ACHTUNG: Neuer Text in Resource? Z~uweisen : Zuweisen Disable = TRUE ; TabStop = TRUE ; Text [ en-US ] = "~Assign" ; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 0c306fbe051a..68dc7d5fb193 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -524,9 +521,6 @@ BOOL SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } } -//enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; -//enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_VERTICALCENTERED,SDRMEASURE_BELOW}; - if( bPositionModified ) { // Position diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 238174cf0c00..6578599ee104 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -26,13 +26,6 @@ * ************************************************************************/ -#if !ENABLE_LAYOUT_EXPERIMENTAL -//#undef ENABLE_LAYOUT -#endif - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <svl/eitem.hxx> #include <svl/intitem.hxx> @@ -589,7 +582,6 @@ void SvxNumberFormatTabPage::Reset( const SfxItemSet& rSet ) AddAutomaticLanguage_Impl(eLangType, pAutoEntryAttr->GetValue()); UpdateFormatListBox_Impl(FALSE,TRUE); -//! erAck 26.01.01 //! This spoils everything because it rematches currency formats based on //! the selected aLbCurrency entry instead of the current format. //! Besides that everything seems to be initialized by now, so why call it? @@ -1131,8 +1123,6 @@ void SvxNumberFormatTabPage::UpdateFormatListBox_Impl String aFormat=*aEntryList[nFmtLbSelPos]; aEdFormat.SetText(aFormat); aFtComment.SetText(pNumFmtShell->GetComment4Entry(nFmtLbSelPos)); - - //@23.09.97 aEdFormat.SetText( aLbFormat.GetSelectEntry() ); } if(!bOneAreaFlag || !bCat) diff --git a/cui/source/tabpages/numfmt.src b/cui/source/tabpages/numfmt.src index b8c35b2d17ad..7eea452f88f5 100644 --- a/cui/source/tabpages/numfmt.src +++ b/cui/source/tabpages/numfmt.src @@ -142,7 +142,6 @@ TabPage RID_SVXPAGE_NUMBERFORMAT { Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 69 , 8 ) ; - /* ### ACHTUNG: Neuer Text in Resource? Führende ~Nullen : F³hrende ~Nullen */ Text [ en-US ] = "Leading ~zeroes" ; }; NumericField ED_LEADZEROES diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 203e7ea1f585..66288342415b 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> @@ -328,7 +325,7 @@ int SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet) void SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pItem; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); + //im Draw gibt es das Item als WhichId, im Writer nur als SlotId SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem); if(eState != SFX_ITEM_SET) @@ -402,11 +399,6 @@ IMPL_LINK(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, ValueSet*, EMPTYARG) return 0; } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -514,8 +506,6 @@ void SvxBulletPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); - if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -573,11 +563,6 @@ void SvxBulletPickTabPage::PageCreated(SfxAllItemSet aSet) } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ - SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -721,7 +706,6 @@ void SvxNumPickTabPage::Reset( const SfxItemSet& rSet ) delete pSaveNum; pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule()); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); if(!pActNum) pActNum = new SvxNumRule(*pSaveNum); else if(*pSaveNum != *pActNum) @@ -850,10 +834,6 @@ void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, } } -/**************************************************************************/ -/* */ -/* */ -/**************************************************************************/ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, const SfxItemSet& rSet) : @@ -877,7 +857,6 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, aLinkedCB.SetClickHdl(LINK(this, SvxBitmapPickTabPage, LinkBmpHdl_Impl)); // Grafiknamen ermitteln - GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(USHORT i = 0; i < aGrfNames.Count(); i++) @@ -925,7 +904,6 @@ void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) const SfxPoolItem* pItem; bPreset = FALSE; BOOL bIsPreset = FALSE; -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); const SfxItemSet* pExampleSet = GetTabDialog()->GetExampleSet(); if(pExampleSet) { @@ -967,8 +945,6 @@ BOOL SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet ) { if ( !aGrfNames.Count() ) { -// das ist im SfxItemSet leider nicht zulaessig #52134# -// rSet.DisableItem(SID_ATTR_NUMBERING_RULE); return FALSE; } if( (bPreset || bModified) && pActNum) @@ -1356,7 +1332,6 @@ void SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet ) else aLevelLB.SelectEntryPos(aLevelLB.GetEntryCount() - 1); -// nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel(); USHORT nMask = 1; aLevelLB.SetUpdateMode(FALSE); aLevelLB.SetNoSelection(); @@ -1636,12 +1611,6 @@ void SvxNumOptionsTabPage::InitControls() aStartED.SetText(aEmptyStr); break; case SHOW_BULLET: - { -// const Font* pFnt = aNumFmtArr[Lvl]->GetBulletFont(); -// if(pFnt) -// ChgTxtFont(aBulletFT, *pFnt); -// aBulletFT.SetText(String((char)aNumFmtArr[nLvl]->GetBulletChar())); - } break; case SHOW_BITMAP: break; @@ -1817,7 +1786,6 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox ) IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { String sSelectStyle; - sal_Int16 eOldType; BOOL bShowOrient = FALSE; BOOL bBmp = FALSE; String aEmptyStr; @@ -1827,7 +1795,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) if(nActNumLvl & nMask) { SvxNumberFormat aNumFmt(pActNum->GetLevel(i)); - eOldType = aNumFmt.GetNumberingType(); // PAGEDESC gibt es nicht USHORT nNumType = (USHORT)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos()); aNumFmt.SetNumberingType((sal_Int16)nNumType); @@ -1855,8 +1822,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) aNumFmt.SetBulletChar( SVX_DEF_BULLET ); pActNum->SetLevel(i, aNumFmt); SwitchNumberType(SHOW_BULLET); - //ChgTxtFont(aBulletFT, *aNumFmt.GetBulletFont()); - //aBulletFT.SetText( aNumFmt.GetBulletChar() ); // Zuweisung der Zeichenvorlage automatisch if(bAutomaticCharStyles) { @@ -1867,7 +1832,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aNumFmt.SetPrefix( aPrefixED.GetText() ); aNumFmt.SetSuffix( aSuffixED.GetText() ); -// aNumFmt.SetBulletFont(0); SwitchNumberType(SHOW_NUMBERING); pActNum->SetLevel(i, aNumFmt); CheckForStartValue_Impl(nNumberingType); @@ -1897,7 +1861,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox ) { aCharFmtLB.SelectEntry(sSelectStyle); CharFmtHdl_Impl(&aCharFmtLB); - // bAutomaticCharStyles wird im CharFmtHdl_Impl zurueckgesetzt bAutomaticCharStyles = TRUE; } return 0; @@ -2005,7 +1968,6 @@ IMPL_LINK( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton ) Size aSize; sal_Bool bSucc(sal_False); SvxOpenGraphicDialog aGrfDlg( CUI_RES(RID_STR_EDIT_GRAPHIC) ); -// aGrfDlg.SetDialogHelpId( HID_NUMBERINGOPT_SEL_GRF_FROM_FILE ); if(MN_GALLERY_ENTRY <= nItemId ) { @@ -2436,7 +2398,6 @@ void SvxNumberingPreview::Paint( const Rectangle& /*rRect*/ ) aStdFont.SetColor(aTextColor); aStdFont.SetFillColor(aBackColor); - // USHORT nFontHeight = nYStep * 6 / 10; if(bPosition) nFontHeight = nYStep * 15 / 10; @@ -3040,7 +3001,6 @@ void SvxNumPositionTabPage::ActivatePage(const SfxItemSet& rSet) if(SFX_ITEM_SET == pExampleSet->GetItemState(SID_PARAM_CUR_NUM_LEVEL, FALSE, &pItem)) nTmpNumLvl = ((const SfxUInt16Item*)pItem)->GetValue(); } - // if(SFX_ITEM_SET == rSet.GetItemState(nNumItemId, FALSE, &pItem)) { delete pSaveNum; diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 3556f8bd85aa..46d5da8355bb 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index c4c9dde501f6..afabe8b31d02 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <svl/style.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> @@ -181,9 +178,6 @@ USHORT GetHtmlMode_Impl(const SfxItemSet& rSet) IMPL_LINK( SvxStdParagraphTabPage, ELRLoseFocusHdl, Edit *, EMPTYARG ) { -//! if ( aLeftIndent.IsRelativeMode() ) -//! return 0; //!!! - SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); FieldUnit eUnit = @@ -274,7 +268,7 @@ BOOL SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) break; default: - DBG_ERROR( "unbekannter Type fuer Zeilenabstand." ); + OSL_FAIL( "unbekannter Type fuer Zeilenabstand." ); break; } eState = GetItemSet().GetItemState( nWhich ); @@ -1003,8 +997,6 @@ void SvxStdParagraphTabPage::PageCreated(SfxAllItemSet aSet) 0x0002 --->EnableRegisterMode() 0x0004 --->EnableAutoFirstLine() 0x0008 --->EnableNegativeMode() - - */ SFX_ITEMSET_ARG (&aSet,pPageWidthItem,SfxUInt16Item,SID_SVXSTDPARAGRAPHTABPAGE_PAGEWIDTH,sal_False); SFX_ITEMSET_ARG (&aSet,pFlagSetItem,SfxUInt32Item,SID_SVXSTDPARAGRAPHTABPAGE_FLAGSET,sal_False); @@ -1710,7 +1702,6 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet& rSet ) aPagenumEdit.Enable(FALSE); aPagenumText.Enable(FALSE); } -//!!! ApplyCollClickHdl_Impl( &aApplyCollBtn ); if ( !bIsPageModel ) { @@ -1936,10 +1927,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe aBreakTypeLB ( this, CUI_RES( LB_BREAKTYPE )), aBreakPositionFT ( this, CUI_RES( FT_BREAKPOSITION )), aBreakPositionLB ( this, CUI_RES( LB_BREAKPOSITION )), -// aPageBox ( this, CUI_RES( BTN_BREAKPAGE ) ), -// aColumnBox ( this, CUI_RES( BTN_BREAKCOLUMN ) ), -// aBeforeBox ( this, CUI_RES( BTN_PAGEBREAKBEFORE ) ), -// aAfterBox ( this, CUI_RES( BTN_PAGEBREAKAFTER ) ), aApplyCollBtn ( this, CUI_RES( BTN_PAGECOLL ) ), aApplyCollBox ( this, CUI_RES( LB_PAGECOLL ) ), aPagenumText ( this, CUI_RES( FT_PAGENUM ) ), @@ -2319,17 +2306,10 @@ void lcl_SetBox(const SfxItemSet& rSet, USHORT nSlotId, TriStateBox& rBox) void SvxAsianTabPage::Reset( const SfxItemSet& rSet ) { lcl_SetBox(rSet, SID_ATTR_PARA_FORBIDDEN_RULES, aForbiddenRulesCB ); -// lcl_SetBox(rSet, , aAllowWordBreakCB ); lcl_SetBox(rSet, SID_ATTR_PARA_HANGPUNCTUATION, aHangingPunctCB ); - //character distance not yet available -// lcl_SetBox(rSet, , aPuntuationCB ); lcl_SetBox(rSet, SID_ATTR_PARA_SCRIPTSPACE, aScriptSpaceCB ); -// lcl_SetBox(rSet, , aAdjustNumbersCB ); -// aAllowWordBreakCB .Enable(FALSE); -// aPuntuationCB .Enable(FALSE); -// aAdjustNumbersCB .Enable(FALSE); } IMPL_LINK( SvxAsianTabPage, ClickHdl_Impl, TriStateBox*, pBox ) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index a1cb7cb80582..4f39be3c957b 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -29,110 +29,74 @@ String RID_SVXSTR_DESC_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Farbverlauf ein: : Geben Sie hier bitte den Namen f³r den Farbverlauf ein: */ Text [ en-US ] = "Please enter a name for the gradient:" ; }; String RID_SVXSTR_ASK_DEL_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Farbverlauf wirklich gelöscht werden? : Soll der Farbverlauf wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the gradient?" ; }; String RID_SVXSTR_ASK_CHANGE_GRADIENT { - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Farbverlauf wurde geändert und nicht gesichert. \nSie können den selektierten Farbverlauf ändern \noder einen neuen Farbverlauf hinzufügen. : Der Farbverlauf wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Farbverlauf õndern \noder einen neuen Farbverlauf hinzuf³gen. */ Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ; }; String RID_SVXSTR_DESC_NEW_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Bitmap ein: : Geben Sie hier bitte den Namen f³r die Bitmap ein: */ Text [ en-US ] = "Please enter a name for the bitmap:" ; }; String RID_SVXSTR_DESC_EXT_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die externe Bitmap ein: : Geben Sie hier bitte den Namen f³r die externe Bitmap ein: */ Text [ en-US ] = "Please enter a name for the external bitmap:" ; }; String RID_SVXSTR_ASK_DEL_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Bitmap wirklich gelöscht werden? : Soll die Bitmap wirklich gel÷scht werden? */ Text [ en-US ] = "Are you sure you want to delete the bitmap?" ; }; String RID_SVXSTR_ASK_CHANGE_BITMAP { - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Bitmap wurde geändert und nicht gesichert. \nSie können die selektierte Bitmap ändern \noder eine neue Bitmap hinzufügen. : Die Bitmap wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Bitmap õndern \noder eine neue Bitmap hinzuf³gen. */ Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ; }; String RID_SVXSTR_DESC_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für den Linienstil ein: : Geben Sie hier bitte den Namen f³r den Linienstil ein: */ Text [ en-US ] = "Please enter a name for the line style:" ; }; String RID_SVXSTR_ASK_DEL_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll der Linienstil wirklich gelöscht werden? : Soll der Linienstil wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the line style?" ; }; String RID_SVXSTR_ASK_CHANGE_LINESTYLE { - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Der Linienstil wurde geändert und nicht gesichert. \nSie können den selektierten Linienstil ändern \noder einen neuen Linienstil hinzufügen. : Der Linienstil wurde geõndert und nicht gesichert. \nSie k÷nnen den selektierten Linienstil õndern \noder einen neuen Linienstil hinzuf³gen. */ Text [ en-US ] = "The line style was modified without saving. \nModify the selected line style or add a new line style." ; }; String RID_SVXSTR_DESC_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die Schraffur ein: : Geben Sie hier bitte den Namen f³r die Schraffur ein: */ Text [ en-US ] = "Please enter a name for the hatching:" ; }; String RID_SVXSTR_ASK_DEL_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Schraffur wirklich gelöscht werden? : Soll die Schraffur wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the hatching?" ; }; String RID_SVXSTR_ASK_CHANGE_HATCH { - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Schraffur wurde geändert und nicht gesichert. \nSie können die selektierte Schraffur ändern \noder eine neue Schraffur hinzufügen. : Die Schraffur wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Schraffur õndern \noder eine neue Schraffur hinzuf³gen. */ Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ; }; String RID_SVXSTR_CHANGE { - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ - /* ### ACHTUNG: Neuer Text in Resource? Ändern : ÂŽndern */ Text [ en-US ] = "Modify" ; }; String RID_SVXSTR_ADD { - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ - /* ### ACHTUNG: Neuer Text in Resource? Hinzufügen : Hinzuf³gen */ Text [ en-US ] = "Add" ; }; String RID_SVXSTR_DESC_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für die neue Farbe ein: : Geben Sie hier bitte den Namen f³r die neue Farbe ein: */ Text [ en-US ] = "Please enter a name for the new color:" ; }; String RID_SVXSTR_ASK_DEL_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll die Farbe wirklich gelöscht werden? : Soll die Farbe wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the color?" ; }; String RID_SVXSTR_ASK_CHANGE_COLOR { - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ - /* ### ACHTUNG: Neuer Text in Resource? Die Farbe wurde geändert und nicht gesichert. \nSie können die selektierte Farbe ändern \noder eine neue Farbe hinzufügen. : Die Farbe wurde geõndert und nicht gesichert. \nSie k÷nnen die selektierte Farbe õndern \noder eine neue Farbe hinzuf³gen. */ Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ; }; String RID_SVXSTR_TABLE @@ -149,8 +113,6 @@ String RID_SVXSTR_READ_DATA_ERROR }; String RID_SVXSTR_WARN_TABLE_OVERWRITE { - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Die Tabelle wurde geändert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? : Die Tabelle wurde geõndert und nicht gespeichert. \nSoll die Tabelle gespeichert werden? */ Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; }; String RID_SVXSTR_WARN_NAME_DUPLICATE @@ -159,20 +121,14 @@ String RID_SVXSTR_WARN_NAME_DUPLICATE }; String RID_SVXSTR_DESC_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ - /* ### ACHTUNG: Neuer Text in Resource? Geben Sie hier bitte den Namen für das neue Linienende ein: : Geben Sie hier bitte den Namen f³r das neue Linienende ein: */ Text [ en-US ] = "Please enter a name for the new arrowhead:" ; }; String RID_SVXSTR_ASK_DEL_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ - /* ### ACHTUNG: Neuer Text in Resource? Soll das Linienende wirklich gelöscht werden? : Soll das Linienende wirklich gel÷scht werden? */ Text [ en-US ] = "Do you want to delete the arrowhead?" ; }; String RID_SVXSTR_ASK_CHANGE_LINEEND { - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ - /* ### ACHTUNG: Neuer Text in Resource? Das Linienende wurde geändert und nicht gesichert. \nMöchten Sie das Linienende jetzt sichern? : Das Linienende wurde geõndert und nicht gesichert. \nM÷chten Sie das Linienende jetzt sichern? */ Text [ en-US ] = "The arrowhead was modified without saving.\nWould you like to save the arrowhead now?" ; }; diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 41df6a759ec8..7a53da94b26c 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <cstddef> #include <swpossizetabpage.hxx> #include <dialmgr.hxx> @@ -95,11 +92,11 @@ struct StringIdPair_Impl #define LB_REL_CHAR 0x00020000L // as char, relative to character #define LB_REL_ROW 0x00040000L // as char, relative to line -// OD 10.11.2003 #i22305# +// #i22305# #define LB_FLY_VERT_FRAME 0x00100000L // vertical entire frame #define LB_FLY_VERT_PRTAREA 0x00200000L // vertical frame text area -// OD 11.11.2003 #i22341# +// #i22341# #define LB_VERT_LINE 0x00400000L // vertical text line static RelationMap aRelationMap[] = @@ -122,11 +119,11 @@ static RelationMap aRelationMap[] = {SwFPos::REL_BORDER, SwFPos::REL_BORDER, LB_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::REL_PRTAREA, SwFPos::REL_PRTAREA, LB_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 10.11.2003 #i22305# + // #i22305# {SwFPos::FLY_REL_PG_FRAME, SwFPos::FLY_REL_PG_FRAME, LB_FLY_VERT_FRAME, RelOrientation::FRAME}, {SwFPos::FLY_REL_PG_PRTAREA, SwFPos::FLY_REL_PG_PRTAREA, LB_FLY_VERT_PRTAREA, RelOrientation::PRINT_AREA}, - // OD 11.11.2003 #i22341# + // #i22341# {SwFPos::REL_LINE, SwFPos::REL_LINE, LB_VERT_LINE, RelOrientation::TEXT_LINE} }; @@ -193,8 +190,8 @@ static FrmMap aHFlyHtmlMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_FLY_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - own vertical alignment map for to frame anchored objects -// OD 10.11.2003 #i22305# +// #i18732# - own vertical alignment map for to frame anchored objects +// #i22305# #define VERT_FRAME_REL (LB_VERT_FRAME|LB_FLY_VERT_PRTAREA) static FrmMap aVFrameMap[] = @@ -298,14 +295,14 @@ static FrmMap aHCharHtmlAbsMap[] = {SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT, HoriOrientation::NONE, LB_REL_PG_FRAME} }; -// OD 19.09.2003 #i18732# - allow vertical alignment at page areas -// OD 12.11.2003 #i22341# - handle <LB_REL_CHAR> on its own +// #i18732# - allow vertical alignment at page areas +// #i22341# - handle <LB_REL_CHAR> on its own #define VERT_CHAR_REL (LB_VERT_FRAME|LB_VERT_PRTAREA| \ LB_REL_PG_FRAME|LB_REL_PG_PRTAREA) static FrmMap aVCharMap[] = { - // OD 11.11.2003 #i22341# + // #i22341# // introduce mappings for new vertical alignment at top of line <LB_VERT_LINE> // and correct mapping for vertical alignment at character for position <FROM_BOTTOM> // Note: Because of these adjustments the map becomes ambigous in its values @@ -477,7 +474,7 @@ SvxSwFramePosString::StringId lcl_ChangeResIdToVerticalOrRTL( } return eStringId; } -// OD 12.11.2003 #i22341# - helper method in order to determine all possible +// #i22341# - helper method in order to determine all possible // listbox relations in a relation map for a given relation ULONG lcl_GetLBRelationsForRelations( const USHORT _nRel ) { @@ -494,7 +491,7 @@ ULONG lcl_GetLBRelationsForRelations( const USHORT _nRel ) return nLBRelations; } -// OD 14.11.2003 #i22341# - helper method on order to determine all possible +// #i22341# - helper method on order to determine all possible // listbox relations in a relation map for a given string ID ULONG lcl_GetLBRelationsForStrID( const FrmMap* _pMap, const SvxSwFramePosString::StringId _eStrId, @@ -913,15 +910,15 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) } m_aHoriMirrorCB.Show(FALSE); m_aKeepRatioCB.Enable(FALSE); - // OD 19.09.2003 #i18732# - hide checkbox in HTML mode + // #i18732# - hide checkbox in HTML mode m_aFollowCB.Show(FALSE); } else { - // OD 06.11.2003 #i18732# correct enable/disable of check box 'Mirror on..' + // #i18732# correct enable/disable of check box 'Mirror on..' m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable/disable check box 'Follow text flow'. + // #i18732# - enable/disable check box 'Follow text flow'. m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); } @@ -979,7 +976,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) m_aVertByMF.SaveValue(); m_aHoriByMF.SaveValue(); - // OD 19.09.2003 #i18732# + // #i18732# m_aFollowCB.SaveValue(); RangeModifyHdl(&m_aWidthMF); // initially set maximum values @@ -1053,7 +1050,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RangeModifyHdl, Edit *, EMPTYARG ) aVal.bAutoHeight = false; aVal.bAutoWidth = false; aVal.bMirror = m_aHoriMirrorCB.IsChecked(); - // OD 18.09.2003 #i18732# + // #i18732# aVal.bFollowTextFlow = m_aFollowCB.IsChecked(); if ( m_pHMap ) @@ -1131,7 +1128,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, AnchorTypeHdl, RadioButton *, EMPTYARG ) { m_aHoriMirrorCB.Enable(!m_aAsCharRB.IsChecked() && !m_bIsMultiSelection); - // OD 06.11.2003 #i18732# - enable check box 'Follow text flow' for anchor + // #i18732# - enable check box 'Follow text flow' for anchor // type to-paragraph' and to-character m_aFollowCB.Enable( m_aToParaRB.IsChecked() || m_aToCharRB.IsChecked() ); @@ -1167,32 +1164,6 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) else m_bAtVertPosModified = TRUE; - // OD 12.11.2003 #i22341# - following special handling no longer needed - /* - if (!bHori && m_pVMap == aVCharMap) - { - // Ausrichtung Vertikal - String sEntry; - USHORT nMapPos = GetMapPos(m_pVMap, m_aVertLB); - USHORT nAlign = GetAlignment(m_pVMap, nMapPos, m_aVertLB, m_aVertToLB); - USHORT nRel = GetRelation(m_pVMap, m_aVertToLB); - - if (nRel == SwFPos::REL_CHAR) - sEntry = m_aFramePosString.GetString(SwFPos::FROMBOTTOM); - else - sEntry = m_aFramePosString.GetString(SwFPos::FROMTOP); - - USHORT nOldPos = m_aVertLB.GetSelectEntryPos(); - - String sName = m_aVertLB.GetEntry(m_aVertLB.GetEntryCount() - 1); - if (sName != sEntry) - { - m_aVertLB.RemoveEntry(m_aVertLB.GetEntryCount() - 1); - m_aVertLB.InsertEntry(sEntry); - m_aVertLB.SelectEntryPos(nOldPos); - } - } - */ if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) // wieder Sonderbehandlung { if(bHori) @@ -1366,7 +1337,7 @@ short SvxSwPosSizeTabPage::GetAlignment(FrmMap *pMap, USHORT nMapPos, ListBox &/ { short nAlign = 0; - // OD 14.11.2003 #i22341# - special handling also for map <aVCharMap>, + // #i22341# - special handling also for map <aVCharMap>, // because it contains ambigous items for alignment if (pMap == aVAsCharHtmlMap || pMap == aVAsCharMap || pMap == aVCharMap ) @@ -1469,7 +1440,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, } else if ( nAnchor == TextContentAnchorType_AT_FRAME ) { - // OD 19.09.2003 #i18732# - own vertical alignment map for to frame + // #i18732# - own vertical alignment map for to frame // anchored objects. m_pVMap = m_bHtmlMode ? aVFlyHtmlMap : aVFrameMap; m_pHMap = m_bHtmlMode ? aHFlyHtmlMap : aHFrameMap; @@ -1516,7 +1487,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nH = m_nOldH; nHRel = m_nOldHRel; } - // OD 12.11.2003 #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nHRel> as 3rd parameter to method <FillPosLB> USHORT nMapPos = FillPosLB(m_pHMap, nH, nHRel, m_aHoriLB); FillRelLB(m_pHMap, nMapPos, nH, nHRel, m_aHoriToLB, m_aHoriToFT); @@ -1526,7 +1497,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, nV = m_nOldV; nVRel = m_nOldVRel; } - // OD 12.11.2003 #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> + // #i22341# - pass <nVRel> as 3rd parameter to method <FillPosLB> nMapPos = FillPosLB(m_pVMap, nV, nVRel, m_aVertLB); FillRelLB(m_pVMap, nMapPos, nV, nVRel, m_aVertToLB, m_aVertToFT); @@ -1675,7 +1646,7 @@ ULONG SvxSwPosSizeTabPage::FillRelLB(FrmMap *pMap, USHORT nMapPos, USHORT nAlign { USHORT nRelCount = SAL_N_ELEMENTS(aRelationMap); - // OD 14.11.2003 #i22341# - special handling for map <aVCharMap>, + // #i22341# - special handling for map <aVCharMap>, // because its ambigous in its <eStrId>/<eMirrorStrId>. if ( pMap == aVCharMap ) { @@ -1768,7 +1739,7 @@ USHORT SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, _rLB.Clear(); - // OD 12.11.2003 #i22341# - determine all possible listbox relations for + // #i22341# - determine all possible listbox relations for // given relation for map <aVCharMap> const ULONG nLBRelations = (_pMap != aVCharMap) ? 0L @@ -1789,7 +1760,7 @@ USHORT SvxSwPosSizeTabPage::FillPosLB(FrmMap *_pMap, // bei zeichengebundenen Rahmen keine doppelten Eintraege einfuegen _rLB.InsertEntry(sEntry); } - // OD 12.11.2003 #i22341# - add condition to handle map <aVCharMap> + // #i22341# - add condition to handle map <aVCharMap> // that is ambigous in the alignment. if ( _pMap[i].nAlign == _nAlign && ( !(_pMap == aVCharMap) || _pMap[i].nLBRelations & nLBRelations ) ) @@ -1816,7 +1787,7 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) m_pSdrView = pSdrView; if(!m_pSdrView) { - DBG_ERROR("No SdrView* set"); + OSL_FAIL("No SdrView* set"); return; } @@ -1876,7 +1847,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) } // this should happen via SID_ATTR_TRANSFORM_AUTOSIZE - if( rMarkList.GetMarkCount() == 1 ) + if( rMarkList.GetMarkCount() != 1 ) + m_bIsMultiSelection = true; +#if OSL_DEBUG_LEVEL > 1 + else { const SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier(); @@ -1884,35 +1858,10 @@ void SvxSwPosSizeTabPage::SetView( const SdrView* pSdrView ) ( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT || eKind==OBJ_OUTLINETEXT) && ( (SdrTextObj*) pObj )->HasText() ) { - DBG_ERROR("AutoWidth/AutoHeight should be enabled"); + OSL_FAIL("AutoWidth/AutoHeight should be enabled"); } } - 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(); +#endif } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx index 49fd6bcf393e..36b1f3a38de2 100644 --- a/cui/source/tabpages/tabarea.cxx +++ b/cui/source/tabpages/tabarea.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/ref.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx index 42e4a867b181..d418bff74a19 100644 --- a/cui/source/tabpages/tabline.cxx +++ b/cui/source/tabpages/tabline.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <vcl/msgbox.hxx> #include <unotools/pathoptions.hxx> @@ -121,13 +118,11 @@ SvxLineTabDialog::SvxLineTabDialog AddTabPage( RID_SVXPAGE_LINE_DEF, SvxLineDefTabPage::Create, 0); AddTabPage( RID_SVXPAGE_LINEEND_DEF, SvxLineEndDefTabPage::Create, 0); -// AddTabPage( RID_SVXPAGE_COLOR, SvxColorTabPage::Create, 0 ); SetCurPageId( RID_SVXPAGE_LINE ); CancelButton& rBtnCancel = GetCancelButton(); rBtnCancel.SetClickHdl( LINK( this, SvxLineTabDialog, CancelHdlImpl ) ); -//! rBtnCancel.SetText( CUI_RESSTR( RID_SVXSTR_CLOSE ) ); } // ----------------------------------------------------------------------- @@ -235,8 +230,8 @@ void SvxLineTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxLineTabPage&) rPage ).SetColorTable( pColorTab ); ( (SvxLineTabPage&) rPage ).SetDashList( pDashList ); ( (SvxLineTabPage&) rPage ).SetLineEndList( pLineEndList ); - ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxLineTabPage&) rPage ).SetPageType( nPageType );//CHINA001 ( (SvxLineTabPage&) rPage ).SetPageType( &nPageType ); + ( (SvxLineTabPage&) rPage ).SetDlgType( nDlgType ); + ( (SvxLineTabPage&) rPage ).SetPageType( nPageType ); ( (SvxLineTabPage&) rPage ).SetPosDashLb( &nPosDashLb ); ( (SvxLineTabPage&) rPage ).SetPosLineEndLb( &nPosLineEndLb ); ( (SvxLineTabPage&) rPage ).SetDashChgd( &nDashListState ); @@ -279,18 +274,6 @@ void SvxLineTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage ) ( (SvxShadowTabPage&) rPage ).Construct(); } break; -/* - case RID_SVXPAGE_COLOR: - ( (SvxColorTabPage&) rPage ).SetColorTable( pColorTab ); - ( (SvxColorTabPage&) rPage ).SetPageType( &nPageType ); - ( (SvxColorTabPage&) rPage ).SetDlgType( &nDlgType ); - ( (SvxColorTabPage&) rPage ).SetPos( &mnPos ); - ( (SvxColorTabPage&) rPage ).SetAreaTP( &mbAreaTP ); - ( (SvxColorTabPage&) rPage ).SetColorChgd( &mnColorTableState ); - ( (SvxColorTabPage&) rPage ).SetDeleteColorTable( mbDeleteColorTable ); - ( (SvxColorTabPage&) rPage ).Construct(); - break; -*/ } } diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 1dfabdf356b4..55b6acd21258 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index b44b9a86237f..c7c38975a6d2 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 67c97784e417..8a4a59fa238f 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <sfx2/app.hxx> #include <sfx2/module.hxx> @@ -421,7 +418,7 @@ BOOL SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) switch( eState ) { default: ; //prevent warning - DBG_ERROR( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); + OSL_FAIL( "svx::SvxTextAttrPage::FillItemSet(), unhandled state!" ); case STATE_NOCHECK: eFTS = SDRTEXTFIT_NONE; break; case STATE_CHECK: eFTS = SDRTEXTFIT_AUTOFIT; break; } @@ -755,7 +752,6 @@ bool SvxTextAttrPage::IsTextDirectionLeftToRight (void) const return bLeftToRightDirection; } -//add CHINA001 begin void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) { SFX_ITEMSET_ARG (&aSet,pViewItem,OfaPtrItem,SID_SVXTEXTATTRPAGE_VIEW,sal_False); @@ -766,6 +762,4 @@ void SvxTextAttrPage::PageCreated(SfxAllItemSet aSet) Construct(); } -//end of CHINA001 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index c101406b643c..8493665bc01d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <sfx2/app.hxx> @@ -37,7 +34,7 @@ #define _SVX_TPAREA_CXX -#if defined (UNX) || defined (WTC) || defined (ICC) || defined(WNT) +#if defined (UNX) || defined (ICC) || defined(WNT) #include <stdlib.h> #endif @@ -1248,7 +1245,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese nicht skaliert werden; dieses wird - // im Item beruecksichtigt ( KA05.11.96 ) + // im Item beruecksichtigt pItem = new XFillBmpSizeXItem( -labs( static_cast<long>(aMtrFldXSize.GetValue()) ) ); } } @@ -1285,7 +1282,7 @@ BOOL SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Prozentwerte werden negativ gesetzt, damit // diese vom MetricItem nicht skaliert werden; - // dieses wird im Item beruecksichtigt ( KA05.11.96 ) + // dieses wird im Item beruecksichtigt pItem = new XFillBmpSizeYItem( -labs( static_cast<long>(aMtrFldYSize.GetValue()) ) ); } } diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 3216a8cff824..e7b5cf60275d 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - //svdraw.hxx #define _SVDRAW_HXX #define _SDR_NOITEMS @@ -125,7 +122,6 @@ SvxBitmapTabPage::SvxBitmapTabPage // Setzen des Output-Devices rXFSet.Put( aXFStyleItem ); rXFSet.Put( aXBitmapItem ); - //aCtlPreview.SetAttributes( aXFillAttr ); aBtnAdd.SetClickHdl( LINK( this, SvxBitmapTabPage, ClickAddHdl_Impl ) ); aBtnImport.SetClickHdl( @@ -357,14 +353,6 @@ IMPL_LINK( SvxBitmapTabPage, ChangeBitmapHdl_Impl, void *, EMPTYARG ) } if( pXOBitmap ) { - //WorkWindow aTmpWW( DLGWIN ); - //VirtualDevice aVD( aTmpWW ); - //USHORT nLines = aCtlPixel.GetLineCount(); - //Color aPixelColor, aBackColor; - //BOOL bPixelColor = FALSE; - //USHORT nWidth = pBitmap->GetSizePixel().Width(); - //USHORT nHeight = pBitmap->GetSizePixel().Height(); - // #85339# try to convert bitmapped item to array item. if(pXOBitmap->GetBitmapType() == XBITMAP_IMPORT) { @@ -576,9 +564,7 @@ long SvxBitmapTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -647,7 +633,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -778,7 +763,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -798,7 +782,6 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbBitmaps.Invalidate(); } #endif diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 039cd18a16cd..124417157409 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <unotools/pathoptions.hxx> @@ -456,10 +453,8 @@ IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { Window *pWindow = this; - bool bEnabled; while( pWindow ) { - bEnabled = pWindow->IsEnabled(); pWindow = pWindow->GetParent(); } @@ -1164,17 +1159,9 @@ void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs ) void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, USHORT& rK ) { - USHORT nColor1, nColor2, nColor3; - USHORT nProzent; // nur temporaer !!! - - nColor1 = 255 - rColor.GetRed(); - nProzent = ColorToPercent_Impl( nColor1 ); - - nColor2 = 255 - rColor.GetGreen(); - nProzent = ColorToPercent_Impl( nColor2 ); - - nColor3 = 255 - rColor.GetBlue(); - nProzent = ColorToPercent_Impl( nColor3 ); + USHORT const nColor1 = 255 - rColor.GetRed(); + USHORT const nColor2 = 255 - rColor.GetGreen(); + USHORT const nColor3 = 255 - rColor.GetBlue(); rK = Min( Min( nColor1, nColor2 ), nColor3 ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 492802a80a17..e7b68c9f2f95 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <vcl/wrkwin.hxx> #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -115,9 +112,7 @@ SvxGradientTabPage::SvxGradientTabPage // Solange NICHT vom Item unterstuetzt - //aMtrColorTo.Disable(); aMtrColorTo.SetValue( 100 ); - //aMtrColorFrom.Disable(); aMtrColorFrom.SetValue( 100 ); // Setzen des Output-Devices @@ -312,9 +307,7 @@ long SvxGradientTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -484,7 +477,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -513,7 +505,6 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbGradients.Invalidate(); } #endif @@ -719,7 +710,6 @@ IMPL_LINK( SvxGradientTabPage, ClickLoadHdl_Impl, void *, EMPTYARG ) else { LeaveWait(); - //aIStream.Close(); ErrorBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 771ad92430e5..7896c0aa128c 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> @@ -285,9 +282,7 @@ long SvxHatchTabPage::CheckChanges_Impl() break; case RET_CANCEL: - // return( -1L ); <-- wuerde die Seite nicht verlassen break; - // return( TRUE ); // Abbruch } delete aMessDlg; } @@ -338,7 +333,6 @@ BOOL SvxHatchTabPage::FillItemSet( SfxItemSet& rSet ) void SvxHatchTabPage::Reset( const SfxItemSet& rSet ) { - // aLbHatchings.SelectEntryPos( 0 ); ChangeHatchHdl_Impl( this ); // Status der Buttons ermitteln @@ -461,19 +455,6 @@ IMPL_LINK( SvxHatchTabPage, ChangeHatchHdl_Impl, void *, EMPTYARG ) default: aCtlAngle.SetActualRP( RP_MM ); break; } - // Backgroundcolor - /* - const SfxPoolItem* pPoolItem = NULL; - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLBACKGROUND ), TRUE, &pPoolItem ) ) - { - rXFSet.Put ( XFillBackgroundItem( ( ( XFillBackgroundItem* )pPoolItem)->GetValue() ) ); - if( SFX_ITEM_SET == rOutAttrs.GetItemState( GetWhich( XATTR_FILLCOLOR ), TRUE, &pPoolItem ) ) - { - Color aColor( ( ( const XFillColorItem* ) pPoolItem )->GetValue() ); - rXFSet.Put( XFillColorItem( String(), aColor ) ); - } - } - */ // ItemSet fuellen und an aCtlPreview weiterleiten rXFSet.Put( XFillHatchItem( String(), *pHatch ) ); aCtlPreview.SetAttributes( aXFillAttr.GetItemSet() ); @@ -548,7 +529,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( pWarnBox->Execute() != RET_OK ) break; } - //Rectangle aDlgRect( pDlg->GetPosPixel(), pDlg->GetSizePixel() ); delete pDlg; delete pWarnBox; @@ -572,7 +552,6 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) if( TRUE ) { // ??? overlapped with pDlg // and srolling Invalidate( aRect ); - //aLbHatchings.Invalidate(); } #endif diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 48c4dc41e271..cfa9731a63c9 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #ifndef _SVX_SIZEITEM_HXX //autogen #include <editeng/sizeitem.hxx> #endif diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index f4057e3ae1b8..4dd53f46a7ed 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - #include <tools/shl.hxx> #include <tools/urlobj.hxx> #include <vcl/msgbox.hxx> diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 9b5573416dd1..b770136bbf7c 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <tools/urlobj.hxx> diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index bf615350c5c8..54a4aa473587 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> #include <sfx2/app.hxx> diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 2c6b73bc2985..acd806a1790a 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -26,9 +26,6 @@ * ************************************************************************/ -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_cui.hxx" - // include --------------------------------------------------------------- #include <tools/shl.hxx> @@ -558,7 +555,6 @@ void SvxSlantTabPage::Construct() BOOL SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) { BOOL bModified = FALSE; - INT32 nValue = 0L; String aStr = aMtrRadius.GetText(); if( aStr != aMtrRadius.GetSavedValue() ) @@ -575,7 +571,7 @@ BOOL SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) if( aStr != aMtrAngle.GetSavedValue() ) { - nValue = static_cast<INT32>(aMtrAngle.GetValue()); + INT32 nValue = static_cast<INT32>(aMtrAngle.GetValue()); rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); bModified = TRUE; } |