[Libreoffice-commits] .: sw/source
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Nov 13 00:40:54 PST 2010
sw/source/ui/inc/utlui.hrc | 8 -------
sw/source/ui/index/cnttab.cxx | 26 ++-----------------------
sw/source/ui/index/cnttab.hrc | 4 ---
sw/source/ui/index/cnttab.src | 14 +------------
sw/source/ui/index/swuiidxmrk.cxx | 22 ++-------------------
sw/source/ui/utlui/utlui.src | 39 --------------------------------------
6 files changed, 11 insertions(+), 102 deletions(-)
New commits:
commit aa115544e69846b309ba7946b544bbbdd60469f7
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Nov 13 00:36:35 2010 -0800
Purged BmpColorMode from libs-gui - writer
diff --git a/sw/source/ui/inc/utlui.hrc b/sw/source/ui/inc/utlui.hrc
index 17961ad..812dc4b 100644
--- a/sw/source/ui/inc/utlui.hrc
+++ b/sw/source/ui/inc/utlui.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -158,12 +158,6 @@
#define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6)
#define ILIST_DB_DLG_HC (RC_UTLUI_BEGIN + 7)
-#define IMG_ONE_LEFT_HC (RC_UTLUI_BEGIN + 8)
-#define IMG_ONE_RIGHT_HC (RC_UTLUI_BEGIN + 9)
-#define IMG_ALL_LEFT_HC (RC_UTLUI_BEGIN + 10)
-#define IMG_ALL_RIGHT_HC (RC_UTLUI_BEGIN + 11)
-
-
#define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12)
#define IMG_VIEWLAYOUT_AUTOMATIC_ACTIVE (RC_UTLUI_BEGIN + 13)
#define IMG_VIEWLAYOUT_BOOKMODE (RC_UTLUI_BEGIN + 14)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index ed51110..5dbfaae 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -736,9 +736,6 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
{
FreeResource();
- aLeftPB.SetModeImage( Image( SW_RES( IMG_ALL_LEFT_HC ) ), BMP_COLOR_HIGHCONTRAST );
- aRightPB.SetModeImage( Image( SW_RES( IMG_ALL_RIGHT_HC ) ), BMP_COLOR_HIGHCONTRAST );
-
aOk.SetClickHdl(LINK(this, SwAddStylesDlg_Impl, OkHdl));
aLeftPB.SetClickHdl(LINK(this, SwAddStylesDlg_Impl, LeftRightHdl));
aRightPB.SetClickHdl(LINK(this, SwAddStylesDlg_Impl, LeftRightHdl));
@@ -758,7 +755,6 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent,
SwIndexTreeLB& rTLB = aHeaderTree.GetTreeListBox();
rTLB.SetWindowBits(WB_CLIPCHILDREN|WB_SORT);
- //aStylesTLB.SetSelectHdl(LINK(this, SwAddStylesDlg_Impl, SelectHdl));
rTLB.GetModel()->SetSortMode(SortAscending);
for(i = 0; i < MAXLEVEL; ++i)
{
@@ -882,7 +878,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
aCreateFromFL( this, SW_RES(FL_CREATEFROM )),
aFromHeadingsCB( this, SW_RES(CB_FROMHEADINGS )),
-// aChapterDlgPB( this, SW_RES(PB_CHAPTERDLG )),//#outline level,removed by zhaojianwei
aAddStylesCB( this, SW_RES(CB_ADDSTYLES )),
aAddStylesPB( this, SW_RES(PB_ADDSTYLES )),
@@ -959,7 +954,6 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS
aTypeLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl));
aAddStylesPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, AddStylesHdl));
- //aChapterDlgPB.SetClickHdl(LINK(this, SwTOXSelectTabPage, ChapterHdl));//#outline level,removed by zhaojianwei
PopupMenu* pMenu = aAutoMarkPB.GetPopupMenu();
pMenu->SetActivateHdl(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
@@ -1123,7 +1117,6 @@ void SwTOXSelectTabPage::ApplyTOXDescription()
if(TOX_CONTENT == aCurType.eType)
{
aFromHeadingsCB.Check( 0 != (nCreateType & nsSwTOXElement::TOX_OUTLINELEVEL) );
- //aChapterDlgPB.Enable(aFromHeadingsCB.IsChecked());//#outline level,removed by zhaojianwei
aAddStylesCB.SetText(sAddStyleContent);
aAddStylesPB.Enable(aAddStylesCB.IsChecked());
}
@@ -1975,15 +1968,6 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
m_pCurrentForm(0),
bInLevelHdl(sal_False)
{
- Image aSortUpHC(SW_RES(IMG_SORTUP_HC ));
- aFirstSortUpRB.SetModeRadioImage(aSortUpHC,BMP_COLOR_HIGHCONTRAST);
- aSecondSortUpRB.SetModeRadioImage(aSortUpHC,BMP_COLOR_HIGHCONTRAST);
- aThirdSortUpRB.SetModeRadioImage(aSortUpHC,BMP_COLOR_HIGHCONTRAST);
-
- Image aSortDownHC(SW_RES(IMG_SORTDOWN_HC ));
- aFirstSortDownRB.SetModeRadioImage(aSortDownHC,BMP_COLOR_HIGHCONTRAST);
- aSecondSortDownRB.SetModeRadioImage(aSortDownHC,BMP_COLOR_HIGHCONTRAST);
- aThirdSortDownRB.SetModeRadioImage(aSortDownHC,BMP_COLOR_HIGHCONTRAST);
FreeResource();
sLevelStr = aLevelFT.GetText();
@@ -2052,7 +2036,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet
(aRelToStyleIdxPos.Y() - aAlphaDelimCB.GetPosPixel().Y());
aEditStylePB.Enable(sal_False);
-//get position for Numbering and other stuff
+ //get position for Numbering and other stuff
aChapterEntryFTPosition = aChapterEntryFT.GetPosPixel();
aEntryOutlineLevelFTPosition = aEntryOutlineLevelFT.GetPosPixel();
nBiasToEntryPoint = aEntryOutlineLevelNF.GetPosPixel().X() -
@@ -3679,8 +3663,6 @@ SwTOXStylesTabPage::SwTOXStylesTabPage(Window* pParent, const SfxItemSet& rAttrS
FreeResource();
SetExchangeSupport( sal_True );
- aAssignBT.SetModeImage( Image( SW_RES( IMG_ONE_LEFT_HC ) ), BMP_COLOR_HIGHCONTRAST );
-
aEditStyleBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, EditStyleHdl));
aAssignBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, AssignHdl));
aStdBT.SetClickHdl (LINK( this, SwTOXStylesTabPage, StdHdl));
@@ -3789,13 +3771,12 @@ IMPL_LINK( SwTOXStylesTabPage, EditStyleHdl, Button *, pBtn )
{
SfxStringItem aStyle(SID_STYLE_EDIT, aParaLayLB.GetSelectEntry());
SfxUInt16Item aFamily(SID_STYLE_FAMILY, SFX_STYLE_FAMILY_PARA);
-// SwPtrItem aShell(FN_PARAM_WRTSHELL, pWrtShell);
Window* pDefDlgParent = Application::GetDefDialogParent();
Application::SetDefDialogParent( pBtn );
SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
rSh.GetView().GetViewFrame()->GetDispatcher()->Execute(
SID_STYLE_EDIT, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_MODAL,
- &aStyle, &aFamily/*, &aShell*/, 0L);
+ &aStyle, &aFamily, 0L);
Application::SetDefDialogParent( pDefDlgParent );
}
return 0;
@@ -3864,7 +3845,6 @@ IMPL_LINK_INLINE_END( SwTOXStylesTabPage, DoubleClickHdl, Button *, EMPTYARG )
--------------------------------------------------------------------*/
IMPL_LINK( SwTOXStylesTabPage, EnableSelectHdl, ListBox *, EMPTYARG )
{
- //UpdatePattern();
aStdBT.Enable(aLevelLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND);
SwWrtShell& rSh = ((SwMultiTOXTabDialog*)GetTabDialog())->GetWrtShell();
diff --git a/sw/source/ui/index/cnttab.hrc b/sw/source/ui/index/cnttab.hrc
index 5b80e43..3869e06 100644
--- a/sw/source/ui/index/cnttab.hrc
+++ b/sw/source/ui/index/cnttab.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -222,8 +222,6 @@
#define LB_LANGUAGE 146
#define FT_SORTALG 147
#define LB_SORTALG 148
-#define IMG_SORTUP_HC 149
-#define IMG_SORTDOWN_HC 150
#define ST_NO_BRACKET 151
#define FT_LEVEL_OL 152
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 8220ed4..3972c33 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -231,7 +231,7 @@ TabPage TP_TOX_SELECT
Text = "~..." ;
TabStop = TRUE ;
};
-*/
+*/
CheckBox CB_ADDSTYLES
{
Pos = MAP_APPFONT ( 12 , 115 ) ;
@@ -907,16 +907,6 @@ TabPage TP_TOX_ENTRY
Border = TRUE;
DropDown = TRUE;
};
- Image IMG_SORTUP_HC
- {
- ImageBitmap = Bitmap{File = "sch10712.bmp"; };
- MaskColor = IMAGE_MASK_COLOR ;
- };
- Image IMG_SORTDOWN_HC
- {
- ImageBitmap = Bitmap{File = "sch10713.bmp"; };
- MaskColor = IMAGE_MASK_COLOR ;
- };
ImageRadioButton RB_SORTUP1
{
Pos = MAP_APPFONT ( 222 , 138 ) ;
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 1ec95e7..c5406ec 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -214,16 +214,8 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent,
if(bNewMark)
{
aDelBT.Hide();
-
- {
- ImageList aTempList( SW_RES( IMG_NAVI_ENTRYBMPH ) );
- aNewBT.SetModeImage( aTempList.GetImage( SID_SW_START + CONTENT_TYPE_INDEX ), BMP_COLOR_HIGHCONTRAST );
- }
-
- {
- ImageList aTempList( SW_RES( IMG_NAVI_ENTRYBMP ) );
- aNewBT.SetModeImage( aTempList.GetImage( SID_SW_START + CONTENT_TYPE_INDEX ), BMP_COLOR_NORMAL );
- }
+ ImageList aTempList( SW_RES( IMG_NAVI_ENTRYBMP ) );
+ aNewBT.SetModeImage( aTempList.GetImage( SID_SW_START + CONTENT_TYPE_INDEX ) );
}
else
{
@@ -394,7 +386,6 @@ void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
{
case SCRIPTTYPE_ASIAN: nWhich = RES_CHRATR_CJK_LANGUAGE; break;
case SCRIPTTYPE_COMPLEX:nWhich = RES_CHRATR_CTL_LANGUAGE; break;
- //case SCRIPTTYPE_LATIN:
default:nWhich = RES_CHRATR_LANGUAGE; break;
}
SfxItemSet aLangSet(pSh->GetAttrPool(), nWhich, nWhich);
@@ -402,13 +393,6 @@ void SwIndexMarkDlg::UpdateLanguageDependenciesForPhoneticReading()
nLangForPhoneticReading = ((const SvxLanguageItem&)aLangSet.Get(nWhich)).GetLanguage();
}
- /*
- //enable phonetic reading dependent on the current language
- {
- lang::Locale aLocale( SvxCreateLocale( LanguageType( nLangForPhoneticReading ) ) );
- bIsPhoneticReadingEnabled = xExtendedIndexEntrySupplier->usePhoneticEntry( aLocale );
- }
- */
}
String SwIndexMarkDlg::GetDefaultPhoneticReading( const String& rText )
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index a48e364..11f8940 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -327,43 +327,6 @@ ImageList ILIST_DB_DLG_HC
IMGLIST_IDS;
};
-Image IMG_ONE_LEFT_HC
-{
- ImageBitmap = Bitmap
- {
- File = "one_left_h.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
-};
-
-Image IMG_ONE_RIGHT_HC
-{
- ImageBitmap = Bitmap
- {
- File = "one_right_h.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
-};
-
-Image IMG_ALL_LEFT_HC
-{
- ImageBitmap = Bitmap
- {
- File = "all_left_h.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
-};
-
-Image IMG_ALL_RIGHT_HC
-{
- ImageBitmap = Bitmap
- {
- File = "all_right_h.bmp" ;
- };
- MaskColor = IMAGE_MASK_COLOR ;
-};
-
-
Image IMG_VIEWLAYOUT_AUTOMATIC
{
ImageBitmap = Bitmap
More information about the Libreoffice-commits
mailing list