[Libreoffice-commits] .: starmath/source sw/inc sw/source
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Nov 22 19:10:30 PST 2010
starmath/source/cursor.cxx | 2 -
sw/inc/ndole.hxx | 3 -
sw/source/core/doc/notxtfrm.cxx | 11 +----
sw/source/core/ole/ndole.cxx | 7 ---
sw/source/ui/frmdlg/wrap.cxx | 26 ++++++-------
sw/source/ui/frmdlg/wrap.hrc | 73 ++++++++++++++++++---------------------
sw/source/ui/inc/navipi.hxx | 3 -
sw/source/ui/ribbar/inputwin.cxx | 17 +++------
sw/source/ui/utlui/navipi.cxx | 16 +++-----
sw/source/ui/utlui/navipi.hrc | 3 -
10 files changed, 67 insertions(+), 94 deletions(-)
New commits:
commit 28e494dd87d0e475f14b894d54b2854e649384d2
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Nov 22 19:10:21 2010 -0800
Remove the last of HC icons
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 1219595..bb49354 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -591,7 +591,7 @@ bool SmCursor::InsertLimit(SmSubSup eSubSup, bool bMoveCaret) {
//Create the limit, if needed
SmCaretPos PosAfterLimit;
- SmNode *pLine;
+ SmNode *pLine = NULL;
if(!pSubSup->GetSubSup(eSubSup)){
pLine = new SmPlaceNode();
pSubSup->SetSubSup(eSubSup, pLine);
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index fbfb4ce..82ac812 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -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
@@ -122,7 +122,6 @@ public:
Graphic* GetGraphic();
- Graphic* GetHCGraphic(); // tries to retrieve HighContrast representation if possible
void GetNewReplacement();
virtual BOOL SavePersistentData();
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx
index 92f681d..f42f6f3 100644
--- a/sw/source/core/doc/notxtfrm.cxx
+++ b/sw/source/core/doc/notxtfrm.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
@@ -1019,14 +1019,7 @@ void SwNoTxtFrm::PaintPicture( OutputDevice* pOut, const SwRect &rGrfArea ) cons
//TODO/LATER: is it a problem that the JopSetup isn't used?
//xRef->DoDraw( pOut, aAlignedGrfArea.Pos(), aAlignedGrfArea.SSize(), *pJobSetup );
- // get hi-contrast image, but never for printing
- Graphic* pGraphic = NULL;
- if (pOut && !bPrn && Application::GetSettings().GetStyleSettings().GetHighContrastMode() )
- pGraphic = pOLENd->GetHCGraphic();
-
- // when it is not possible to get HC-representation, the original image should be used
- if ( !pGraphic )
- pGraphic = pOLENd->GetGraphic();
+ Graphic* pGraphic = pOLENd->GetGraphic();
if ( pGraphic && pGraphic->GetType() != GRAPHIC_NONE )
{
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index ecb7289..8db425f 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.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
@@ -278,11 +278,6 @@ Graphic* SwOLENode::GetGraphic()
return pGraphic;
}
-Graphic* SwOLENode::GetHCGraphic()
-{
- return aOLEObj.xOLERef.GetHCGraphic();
-}
-
SwCntntNode *SwOLENode::SplitCntntNode( const SwPosition & )
{
// OLE-Objecte vervielfaeltigen ??
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 4bf818d..1255af0 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.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
@@ -116,7 +116,6 @@ SwWrapTabPage::SwWrapTabPage(Window *pParent, const SfxItemSet &rSet) :
aWrapOutsideCB (this, SW_RES(CB_ONLYOUTSIDE)),
aWrapIL (SW_RES(IL_WRAP)),
- aWrapILH (SW_RES(ILH_WRAP)),
nAnchorId(FLY_AT_PARA),
nHtmlMode(0),
@@ -703,26 +702,25 @@ void SwWrapTabPage::DataChanged( const DataChangedEvent& rDCEvt )
void SwWrapTabPage::ApplyImageList()
{
- ImageList& rImgLst = GetSettings().GetStyleSettings().GetHighContrastMode() ?
- aWrapILH : aWrapIL;
+ ImageList& rImgLst = aWrapIL;
aWrapThroughRB.SetModeRadioImage(rImgLst.GetImage(IMG_THROUGH));
BOOL bWrapOutline = !aWrapOutlineCB.IsChecked();
if(bWrapOutline)
{
- aNoWrapRB.SetModeRadioImage(rImgLst.GetImage(IMG_NONE));
- aWrapLeftRB.SetModeRadioImage(rImgLst.GetImage(IMG_LEFT));
- aWrapRightRB.SetModeRadioImage(rImgLst.GetImage(IMG_RIGHT));
- aWrapParallelRB.SetModeRadioImage(rImgLst.GetImage(IMG_PARALLEL));
- aIdealWrapRB.SetModeRadioImage(rImgLst.GetImage(IMG_IDEAL));
+ aNoWrapRB.SetModeRadioImage( rImgLst.GetImage( IMG_NONE ));
+ aWrapLeftRB.SetModeRadioImage( rImgLst.GetImage( IMG_LEFT ));
+ aWrapRightRB.SetModeRadioImage( rImgLst.GetImage( IMG_RIGHT ));
+ aWrapParallelRB.SetModeRadioImage( rImgLst.GetImage( IMG_PARALLEL ));
+ aIdealWrapRB.SetModeRadioImage( rImgLst.GetImage( IMG_IDEAL ));
}
else
{
- aNoWrapRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_NONE ));
- aWrapLeftRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_LEFT ));
- aWrapRightRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_RIGHT ));
- aWrapParallelRB.SetModeRadioImage(rImgLst.GetImage(IMG_KON_PARALLEL ));
- aIdealWrapRB.SetModeRadioImage(rImgLst.GetImage( IMG_KON_IDEAL ));
+ aNoWrapRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_NONE ));
+ aWrapLeftRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_LEFT ));
+ aWrapRightRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_RIGHT ));
+ aWrapParallelRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_PARALLEL ));
+ aIdealWrapRB.SetModeRadioImage( rImgLst.GetImage( IMG_KON_IDEAL ));
}
}
diff --git a/sw/source/ui/frmdlg/wrap.hrc b/sw/source/ui/frmdlg/wrap.hrc
index 077d8af..9cfb254 100644
--- a/sw/source/ui/frmdlg/wrap.hrc
+++ b/sw/source/ui/frmdlg/wrap.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
@@ -24,43 +24,40 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#define RB_NO_WRAP 2
-#define RB_WRAP_LEFT 3
-#define RB_WRAP_RIGHT 4
-#define RB_WRAP_PARALLEL 5
-#define RB_WRAP_THROUGH 6
-#define RB_WRAP_IDEAL 7
-#define CB_ANCHOR_ONLY 8
-#define FT_LEFT_MARGIN 13
-#define ED_LEFT_MARGIN 14
-#define FT_RIGHT_MARGIN 15
-#define ED_RIGHT_MARGIN 16
-#define FT_TOP_MARGIN 17
-#define ED_TOP_MARGIN 18
-#define ED_BOTTOM_MARGIN 19
-#define FT_BOTTOM_MARGIN 20
-#define FL_MARGIN 21
-#define CB_TRANSPARENT 22
-#define CB_OUTLINE 23
-#define FL_OPTION 24
-#define CB_ONLYOUTSIDE 25
-#define FL_OPTION_SEP 26
-#define C_WRAP_FL 31
+#define RB_NO_WRAP 2
+#define RB_WRAP_LEFT 3
+#define RB_WRAP_RIGHT 4
+#define RB_WRAP_PARALLEL 5
+#define RB_WRAP_THROUGH 6
+#define RB_WRAP_IDEAL 7
+#define CB_ANCHOR_ONLY 8
+#define FT_LEFT_MARGIN 13
+#define ED_LEFT_MARGIN 14
+#define FT_RIGHT_MARGIN 15
+#define ED_RIGHT_MARGIN 16
+#define FT_TOP_MARGIN 17
+#define ED_TOP_MARGIN 18
+#define ED_BOTTOM_MARGIN 19
+#define FT_BOTTOM_MARGIN 20
+#define FL_MARGIN 21
+#define CB_TRANSPARENT 22
+#define CB_OUTLINE 23
+#define FL_OPTION 24
+#define CB_ONLYOUTSIDE 25
+#define FL_OPTION_SEP 26
+#define C_WRAP_FL 31
#define IL_WRAP 32
-#define ILH_WRAP 33
// nur fuer die ImageList
-#define IMG_BEGIN 1
-#define IMG_NONE (IMG_BEGIN)
-#define IMG_LEFT (IMG_BEGIN + 1)
-#define IMG_RIGHT (IMG_BEGIN + 2)
-#define IMG_PARALLEL (IMG_BEGIN + 3)
-#define IMG_THROUGH (IMG_BEGIN + 4)
-#define IMG_IDEAL (IMG_BEGIN + 5)
-#define IMG_KON_NONE (IMG_BEGIN + 6)
-#define IMG_KON_LEFT (IMG_BEGIN + 7)
-#define IMG_KON_RIGHT (IMG_BEGIN + 8)
-#define IMG_KON_PARALLEL (IMG_BEGIN + 9)
-#define IMG_KON_IDEAL (IMG_BEGIN + 10)
-
-
+#define IMG_BEGIN 1
+#define IMG_NONE (IMG_BEGIN)
+#define IMG_LEFT (IMG_BEGIN + 1)
+#define IMG_RIGHT (IMG_BEGIN + 2)
+#define IMG_PARALLEL (IMG_BEGIN + 3)
+#define IMG_THROUGH (IMG_BEGIN + 4)
+#define IMG_IDEAL (IMG_BEGIN + 5)
+#define IMG_KON_NONE (IMG_BEGIN + 6)
+#define IMG_KON_LEFT (IMG_BEGIN + 7)
+#define IMG_KON_RIGHT (IMG_BEGIN + 8)
+#define IMG_KON_PARALLEL (IMG_BEGIN + 9)
+#define IMG_KON_IDEAL (IMG_BEGIN + 10)
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 2c042bc..b9c73b0 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -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
@@ -70,7 +70,6 @@ class SwNavigationPI : public Window,
SwNavHelpToolBox aContentToolBox;
SwHelpToolBox aGlobalToolBox;
ImageList aContentImageList;
- ImageList aContentImageListH;
SwContentTree aContentTree;
SwGlobalTree aGlobalTree;
ListBox aDocListBox;
diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx
index 5826753..e61f0ea 100644
--- a/sw/source/ui/ribbar/inputwin.cxx
+++ b/sw/source/ui/ribbar/inputwin.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
@@ -93,10 +93,9 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind )
InsertWindow( ED_FORMULA, &aEdit);
SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
- BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
- SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC ));
- SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL, bHC ));
- SetItemImage( FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY, bHC ));
+ SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC ));
+ SetItemImage( FN_FORMULA_CANCEL, pManager->GetImage(FN_FORMULA_CANCEL ));
+ SetItemImage( FN_FORMULA_APPLY, pManager->GetImage(FN_FORMULA_APPLY ));
SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) | TIB_DROPDOWNONLY );
SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
@@ -154,11 +153,9 @@ void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
// update item images
SwModule *pMod = SW_MOD();
SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
- BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
- //
- SetItemImage( FN_FORMULA_CALC, pImgMgr->GetImage(FN_FORMULA_CALC, bHC ));
- SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL, bHC ));
- SetItemImage( FN_FORMULA_APPLY, pImgMgr->GetImage(FN_FORMULA_APPLY, bHC ));
+ SetItemImage( FN_FORMULA_CALC, pImgMgr->GetImage(FN_FORMULA_CALC ));
+ SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
+ SetItemImage( FN_FORMULA_APPLY, pImgMgr->GetImage(FN_FORMULA_APPLY ));
}
ToolBox::DataChanged( rDCEvt );
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index be449ec..1ba6702 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.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
@@ -574,7 +574,7 @@ void SwNavigationPI::MakeMark()
// this assumes that IDocumentMarkAccess generates Names in ascending order
if(vNavMarkNames.size() == MAX_MARKS)
pMarkAccess->deleteMark(pMarkAccess->findMark(vNavMarkNames[nAutoMarkIdx]));
-
+
rSh.SetBookmark(KeyCode(), ::rtl::OUString(), ::rtl::OUString(), IDocumentMarkAccess::NAVIGATOR_REMINDER);
SwView::SetActMark( nAutoMarkIdx );
@@ -707,7 +707,6 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
aContentToolBox(this, SW_RES(TB_CONTENT)),
aGlobalToolBox(this, SW_RES(TB_GLOBAL)),
aContentImageList(SW_RES(IL_CONTENT)),
- aContentImageListH(SW_RES(ILH_CONTENT)),
aContentTree(this, SW_RES(TL_CONTENT)),
aGlobalTree(this, SW_RES(TL_GLOBAL)),
aDocListBox(this, SW_RES(LB_DOCS)),
@@ -799,7 +798,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
if(
(
aTmpParentSize.Width() < aMinSize.Width() ||
- aTmpParentSize.Height() < aMinSize.Height()
+ aTmpParentSize.Height() < aMinSize.Height()
)
&&
((SfxDockingWindow*)pParent)->GetFloatingWindow() &&
@@ -1266,11 +1265,9 @@ void SwNavigationPI::SetRegionDropMode(USHORT nNewMode)
else if(nRegionMode == REGION_MODE_EMBEDDED)
nDropId = FN_DROP_REGION_COPY;
- ImageList& rImgLst = aContentToolBox.GetSettings().GetStyleSettings().GetHighContrastMode()
- ? aContentImageListH : aContentImageList;
+ ImageList& rImgLst = aContentImageList;
- aContentToolBox.SetItemImage( FN_DROP_REGION,
- rImgLst.GetImage(nDropId));
+ aContentToolBox.SetItemImage( FN_DROP_REGION, rImgLst.GetImage(nDropId));
}
@@ -1399,8 +1396,7 @@ void SwNavigationPI::InitImageList()
{
USHORT k;
- ImageList& rImgLst = aContentToolBox.GetSettings().GetStyleSettings().GetHighContrastMode() ?
- aContentImageListH : aContentImageList;
+ ImageList& rImgLst = aContentImageList;
for( k = 0; k < aContentToolBox.GetItemCount(); k++)
aContentToolBox.SetItemImage(aContentToolBox.GetItemId(k),
rImgLst.GetImage(aContentToolBox.GetItemId(k)));
diff --git a/sw/source/ui/utlui/navipi.hrc b/sw/source/ui/utlui/navipi.hrc
index e8a6dc2..8c0f924 100644
--- a/sw/source/ui/utlui/navipi.hrc
+++ b/sw/source/ui/utlui/navipi.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
@@ -31,7 +31,6 @@
#define BT_UP 5
#define BT_DOWN 6
#define IL_CONTENT 7
-#define ILH_CONTENT 8
#define FT_PAGE 10
#define ED_PAGE 11
#define LB_SELECT 22
More information about the Libreoffice-commits
mailing list