This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new e6c3383982 Translate German (Lineal -> Ruler) in Writer code
e6c3383982 is described below
commit e6c3383982593f62c175312992edcb7926eb63f7
Author: mseidel <[email protected]>
AuthorDate: Tue Apr 22 14:44:27 2025 +0200
Translate German (Lineal -> Ruler) in Writer code
(cherry picked from commit bb2d54e74f75a1ae430739cdf01b616ef2cbb9f8)
---
main/sw/inc/cmdid.h | 9 ++--
main/sw/inc/fesh.hxx | 46 ++++++++---------
main/sw/source/ui/app/appopt.cxx | 94 +++++++++++++++++-----------------
main/sw/source/ui/app/swmodul1.cxx | 90 ++++++++++++++++-----------------
main/sw/source/ui/docvw/edtwin3.cxx | 43 ++++++----------
main/sw/source/ui/inc/view.hxx | 75 +++++++++++++--------------
main/sw/source/ui/ribbar/inputwin.cxx | 51 +++++++++----------
main/sw/source/ui/uiview/view.cxx | 20 +++-----
main/sw/source/ui/uiview/view0.cxx | 50 +++++++++---------
main/sw/source/ui/uiview/viewfunc.hxx | 4 +-
main/sw/source/ui/uiview/viewmdi.cxx | 59 +++++++++++-----------
main/sw/source/ui/uiview/viewport.cxx | 95 +++++++++++++++++------------------
main/sw/source/ui/uiview/viewtab.cxx | 48 ++++++++----------
main/sw/source/ui/uno/unomod.cxx | 53 ++++++++++---------
14 files changed, 348 insertions(+), 389 deletions(-)
diff --git a/main/sw/inc/cmdid.h b/main/sw/inc/cmdid.h
index d438ba6012..2145da00ab 100644
--- a/main/sw/inc/cmdid.h
+++ b/main/sw/inc/cmdid.h
@@ -266,14 +266,14 @@ Achtung: Ab sofort sind in diesem File keine
C++-Kommentare (//) mehr
#define FN_DRAW_WRAP_DLG (FN_VIEW + 3) /* Draw Umlauf-Dlg */
-#define FN_RULER (FN_VIEW + 11) /* Horizontales
Lineal */
+#define FN_RULER (FN_VIEW + 11) /* Horizontal
Ruler */
#define FN_VIEW_GRAPHIC (FN_VIEW + 13) /* Grafiken
anzeigen */
#define FN_VIEW_BOUNDS (FN_VIEW + 14) /* Begrenzungen */
#define FN_VIEW_FIELDS (FN_VIEW + 15) /* Textbefehle */
-#define FN_VLINEAL (FN_VIEW + 16) /* Vertikales
Lineal */
-#define FN_VSCROLLBAR (FN_VIEW + 17) /* Vertikaler Scrollbar
*/
-#define FN_HSCROLLBAR (FN_VIEW + 18) /* Horizontaler
Scrollbar */
+#define FN_VLINEAL (FN_VIEW + 16) /* Vertical
Ruler */
+#define FN_VSCROLLBAR (FN_VIEW + 17) /* Vertical Scrollbar */
+#define FN_HSCROLLBAR (FN_VIEW + 18) /* Horizontal Scrollbar
*/
#define FN_TOOLBOX_TOGGLE (FN_VIEW + 19) /* Toolboxinhalte
umschalten */
#define FN_VIEWOPTIONS_ON (FN_VIEW + 20) /* Gruppe Viewoptions
an */
#define FN_VIEWOPTIONS_OFF (FN_VIEW + 21) /* Gruppe Viewoptions
aus */
@@ -289,7 +289,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare
(//) mehr
#define FN_TOOLBOX_SWITCH (FN_VIEW + 30) /* Auf Textshell
umschalten */
-
// noch mehr Navigator
#define FN_CONTENT_LB (FN_VIEW + 32) /**/
#define FN_SHOW_CONTENT_BOX (FN_VIEW + 33) /**/
diff --git a/main/sw/inc/fesh.hxx b/main/sw/inc/fesh.hxx
index 707fcb07bb..cc6f01dd30 100644
--- a/main/sw/inc/fesh.hxx
+++ b/main/sw/inc/fesh.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef _FESH_HXX
#define _FESH_HXX
@@ -42,7 +41,6 @@
#define INCLUDED_VECTOR
#endif
-
class SwFlyFrm;
class SwTabCols;
class SvxBrushItem;
@@ -62,7 +60,7 @@ class SdrMarkList;
namespace svx
{
- class ISdrObjectFilter;
+ class ISdrObjectFilter;
}
@@ -137,9 +135,9 @@ enum CurRectType
RECT_OUTTABSECTION_PRT, //Rect der aktuellen PrtArea des
Bereichs,
// aber
ausserhalb der Tabelle
RECT_HEADERFOOTER, //Rect des aktuellen Headers/Footer
- RECT_HEADERFOOTER_PRT, //Rect der PrtArea des aktuellen
Headers/Footers
+ RECT_HEADERFOOTER_PRT, //Rect der PrtArea des aktuellen
Headers/Footers
- RECT_PAGES_AREA //Rect covering the pages area
+ RECT_PAGES_AREA //Rect covering the pages area
};
struct SwGetCurColNumPara
@@ -186,26 +184,26 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
sal_Bool bCheckForOLEInCaption;
SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
- SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference
< ::com::sun::star::embed::XEmbeddedObject >& ) const;
+ SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&
) const;
//Actions fuer alle Shells beenden und ChangeLink rufen.
SW_DLLPRIVATE void EndAllActionAndCall();
SW_DLLPRIVATE void ScrollTo( const Point &rPt );
- // OD 25.06.2003 #108784# - correct type of 1st parameter
- SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
+ // OD 25.06.2003 #108784# - correct type of 1st parameter
+ SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
- // Used for mouse operations on a table:
- // Returns a cell frame that is 'close' to rPt.
- SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0,
bool* pbCol = 0 ) const;
+ // Used for mouse operations on a table:
+ // Returns a cell frame that is 'close' to rPt.
+ SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0,
bool* pbCol = 0 ) const;
//0 == in keiner Spalte
SW_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
SwGetCurColNumPara* pPara )
const;
- SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox )
const;
- SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox )
const;
+ SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox )
const;
+ SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox )
const;
SW_DLLPRIVATE sal_Bool ImpEndCreate();
@@ -216,13 +214,13 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
const Point&
rInsPt, sal_Bool bIsMove,
sal_Bool
bSelectInsert );
- // get list of marked SdrObjects;
- // helper method for GetSelFrmType, IsSelContainsControl
- SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
+ // get list of marked SdrObjects;
+ // helper method for GetSelFrmType, IsSelContainsControl
+ SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
- SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
+ SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
- using SwEditShell::Copy;
+ using SwEditShell::Copy;
public:
@@ -733,7 +731,7 @@ public:
const String& rCharacterStyle,
const sal_Bool bCpyBrd = sal_True );
- //Das Lineal will auch noch etwas von uns wissen.
+ // Der Ruler will auch noch etwas von uns wissen.
sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 ==
in keiner Spalte
sal_uInt16 GetCurMouseColNum( const Point &rPt,
SwGetCurColNumPara*
pPara = 0 ) const;
@@ -799,3 +797,5 @@ public:
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/app/appopt.cxx b/main/sw/source/ui/app/appopt.cxx
index 603d2bc287..f35bffbc10 100644
--- a/main/sw/source/ui/app/appopt.cxx
+++ b/main/sw/source/ui/app/appopt.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
@@ -91,8 +89,8 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
SwMasterUsrPref* pPref = bTextDialog ? pUsrPref : pWebUsrPref;
//kein MakeUsrPref, da hier nur die Optionen von Textdoks
genommen werden duerfen
SwView* pAppView = GetView();
- if(pAppView && pAppView->GetViewFrame() != SfxViewFrame::Current())
- pAppView = 0;
+ if(pAppView && pAppView->GetViewFrame() !=
SfxViewFrame::Current())
+ pAppView = 0;
if(pAppView)
{
// wenn Text dann nicht WebView und umgekehrt
@@ -100,15 +98,13 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16
nId )
if( (bWebView && !bTextDialog) ||(!bWebView &&
bTextDialog))
{
aViewOpt =
*pAppView->GetWrtShell().GetViewOptions();
- }
+ }
else
pAppView = 0; // mit View kann hier nichts
gewonnen werden
}
/********************************************************************/
- /*
*/
/* Optionen/Bearbeiten
*/
- /*
*/
/********************************************************************/
SfxItemSet* pRet = new SfxItemSet (GetPool(),
FN_PARAM_DOCDISP, FN_PARAM_ELEM,
SID_PRINTPREVIEW, SID_PRINTPREVIEW,
@@ -131,7 +127,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
#endif
0);
- pRet->Put( SwDocDisplayItem( aViewOpt, FN_PARAM_DOCDISP) );
+ pRet->Put( SwDocDisplayItem( aViewOpt, FN_PARAM_DOCDISP) );
pRet->Put( SwElemItem( aViewOpt, FN_PARAM_ELEM) );
if( bTextDialog )
{
@@ -143,7 +139,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
{
SwWrtShell& rWrtShell = pAppView->GetWrtShell();
- SfxPrinter* pPrt = rWrtShell.getIDocumentDeviceAccess()->getPrinter(
false );
+ SfxPrinter* pPrt =
rWrtShell.getIDocumentDeviceAccess()->getPrinter( false );
if( pPrt )
pRet->Put(SwPtrItem(FN_PARAM_PRINTER, pPrt));
pRet->Put(SwPtrItem(FN_PARAM_WRTSHELL, &rWrtShell));
@@ -199,12 +195,12 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16
nId )
FieldUnit eUnit = pPref->GetHScrollMetric();
if(pAppView)
- pAppView->GetHLinealMetric(eUnit);
+ pAppView->GetHRulerMetric(eUnit);
pRet->Put(SfxUInt16Item( FN_HSCROLL_METRIC, static_cast< sal_uInt16
>(eUnit)));
eUnit = pPref->GetVScrollMetric();
if(pAppView)
- pAppView->GetVLinealMetric(eUnit);
+ pAppView->GetVRulerMetric(eUnit);
pRet->Put(SfxUInt16Item( FN_VSCROLL_METRIC, static_cast< sal_uInt16
>(eUnit) ));
pRet->Put(SfxUInt16Item( SID_ATTR_METRIC, static_cast< sal_uInt16
>(pPref->GetMetric()) ));
if(bTextDialog)
@@ -369,16 +365,16 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const
SfxItemSet& rSet )
FieldUnit eUnit = (FieldUnit)pMetricItem->GetValue();
pPref->SetVScrollMetric(eUnit);
if(pAppView)
- pAppView->ChangeVLinealMetric(eUnit);
+ pAppView->ChangeVRulerMetric(eUnit);
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False,
&pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_DEFTABSTOP, sal_False,
&pItem ) )
{
sal_uInt16 nTabDist = ((const SfxUInt16Item*)pItem)->GetValue();
- pPref->SetDefTab(nTabDist);
+ pPref->SetDefTab(nTabDist);
if(pAppView)
{
- SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT,
RES_PARATR_TABSTOP );
+ SvxTabStopItem aDefTabs( 0, 0, SVX_TAB_ADJUST_DEFAULT,
RES_PARATR_TABSTOP );
MakeDefTabs( nTabDist, aDefTabs );
pAppView->GetWrtShell().SetDefault( aDefTabs );
}
@@ -435,10 +431,10 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const
SfxItemSet& rSet )
if (pOpt)
{
const SwAddPrinterItem* pAddPrinterAttr = (const
SwAddPrinterItem*)pItem;
- *pOpt = *pAddPrinterAttr;
+ *pOpt = *pAddPrinterAttr;
- if(pAppView)
-
pAppView->GetWrtShell().getIDocumentDeviceAccess()->setPrintData( *pOpt );
+ if(pAppView)
+
pAppView->GetWrtShell().getIDocumentDeviceAccess()->setPrintData( *pOpt );
}
}
@@ -450,15 +446,15 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const
SfxItemSet& rSet )
pBindings->Invalidate(FN_SHADOWCURSOR);
}
- if( pAppView )
+ if( pAppView )
{
- SwWrtShell &rWrtSh = pAppView->GetWrtShell();
- const bool bAlignFormulas = rWrtSh.GetDoc()->get(
IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
- pPref->SetAlignMathObjectsToBaseline( bAlignFormulas );
-
- // don't align formulas in documents that are currently loading
- if (bAlignFormulas && !rWrtSh.GetDoc()->IsInReading())
- rWrtSh.AlignAllFormulasToBaseline();
+ SwWrtShell &rWrtSh = pAppView->GetWrtShell();
+ const bool bAlignFormulas = rWrtSh.GetDoc()->get(
IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT );
+ pPref->SetAlignMathObjectsToBaseline( bAlignFormulas );
+
+ // don't align formulas in documents that are currently loading
+ if (bAlignFormulas && !rWrtSh.GetDoc()->IsInReading())
+ rWrtSh.AlignAllFormulasToBaseline();
}
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_CRSR_IN_PROTECTED,
sal_False, &pItem ))
@@ -512,16 +508,16 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId,
Window* pParent, const SfxI
}
break;
}
- case RID_SW_TP_HTML_OPTGRID_PAGE:
+ case RID_SW_TP_HTML_OPTGRID_PAGE:
case RID_SVXPAGE_GRID:
pRet = SvxGridTabPage::Create(pParent, rSet);
break;
- case RID_SW_TP_STD_FONT:
- case RID_SW_TP_STD_FONT_CJK:
- case RID_SW_TP_STD_FONT_CTL:
+ case RID_SW_TP_STD_FONT:
+ case RID_SW_TP_STD_FONT_CJK:
+ case RID_SW_TP_STD_FONT_CTL:
{
- SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
if ( pFact )
{
::CreateTabPage fnCreatePage =
pFact->GetTabPageCreatorFunc( nId );
@@ -559,27 +555,27 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId,
Window* pParent, const SfxI
if ( fnCreatePage )
pRet = (*fnCreatePage)( pParent, rSet );
}
- SwView* pCurrView = GetView();
- if(pCurrView)
+ SwView* pCurrView = GetView();
+ if(pCurrView)
{
// wenn Text dann nicht WebView und umgekehrt
- sal_Bool bWebView = 0 != PTR_CAST(SwWebView, pCurrView);
+ sal_Bool bWebView = 0 != PTR_CAST(SwWebView,
pCurrView);
if( (bWebView && RID_SW_TP_HTML_OPTTABLE_PAGE
== nId) ||
(!bWebView &&
RID_SW_TP_HTML_OPTTABLE_PAGE != nId) )
{
- aSet.Put
(SwWrtShellItem(SID_WRT_SHELL,pCurrView->GetWrtShellPtr()));
+ aSet.Put
(SwWrtShellItem(SID_WRT_SHELL,pCurrView->GetWrtShellPtr()));
pRet->PageCreated(aSet);
}
}
}
break;
- case RID_SW_TP_OPTSHDWCRSR:
- case RID_SW_TP_HTML_OPTSHDWCRSR:
- case RID_SW_TP_REDLINE_OPT:
- case RID_SW_TP_OPTLOAD_PAGE:
- case RID_SW_TP_OPTCOMPATIBILITY_PAGE:
- case RID_SW_TP_MAILCONFIG:
- {
+ case RID_SW_TP_OPTSHDWCRSR:
+ case RID_SW_TP_HTML_OPTSHDWCRSR:
+ case RID_SW_TP_REDLINE_OPT:
+ case RID_SW_TP_OPTLOAD_PAGE:
+ case RID_SW_TP_OPTCOMPATIBILITY_PAGE:
+ case RID_SW_TP_MAILCONFIG:
+ {
SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
if ( pFact )
{
@@ -599,7 +595,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId,
Window* pParent, const SfxI
}
break;
#ifdef DBG_UTIL
- case RID_SW_TP_OPTTEST_PAGE:
+ case RID_SW_TP_OPTTEST_PAGE:
{
SwAbstractDialogFactory* pFact =
SwAbstractDialogFactory::Create();
if ( pFact )
@@ -611,7 +607,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId,
Window* pParent, const SfxI
break;
}
#endif
- case RID_SW_TP_BACKGROUND:
+ case RID_SW_TP_BACKGROUND:
{
SfxAbstractDialogFactory* pFact =
SfxAbstractDialogFactory::Create();
if ( pFact )
@@ -639,3 +635,5 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId,
Window* pParent, const SfxI
DBG_ASSERT( pRet, "SwModule::CreateTabPage(): Unknown tabpage id" );
return pRet;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/app/swmodul1.cxx
b/main/sw/source/ui/app/swmodul1.cxx
index dae5502bd3..afd82a4d8a 100644
--- a/main/sw/source/ui/app/swmodul1.cxx
+++ b/main/sw/source/ui/app/swmodul1.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <hintids.hxx>
#include <sfx2/request.hxx>
#include <sfx2/dispatch.hxx>
@@ -82,33 +79,33 @@ void lcl_SetUIPrefs(const SwViewOption* pPref, SwView*
pView, ViewShell* pSh )
{
// in FrameSets kann die tatsaechliche Sichtbarkeit von der Einstellung
der ViewOptions abweichen
sal_Bool bVScrollChanged = pPref->IsViewVScrollBar() !=
pSh->GetViewOptions()->IsViewVScrollBar();
- sal_Bool bHScrollChanged = pPref->IsViewHScrollBar() !=
pSh->GetViewOptions()->IsViewHScrollBar();
- sal_Bool bVAlignChanged = pPref->IsVRulerRight() !=
pSh->GetViewOptions()->IsVRulerRight();
+ sal_Bool bHScrollChanged = pPref->IsViewHScrollBar() !=
pSh->GetViewOptions()->IsViewHScrollBar();
+ sal_Bool bVAlignChanged = pPref->IsVRulerRight() !=
pSh->GetViewOptions()->IsVRulerRight();
- pSh->SetUIOptions(*pPref);
- const SwViewOption* pNewPref = pSh->GetViewOptions();
+ pSh->SetUIOptions(*pPref);
+ const SwViewOption* pNewPref = pSh->GetViewOptions();
- // Scrollbars an / aus
+ // Scrollbar on / off
if(bVScrollChanged)
{
- pView->ShowVScrollbar(pNewPref->IsViewVScrollBar());
+ pView->ShowVScrollbar(pNewPref->IsViewVScrollBar());
}
if(bHScrollChanged)
{
- pView->ShowHScrollbar( pNewPref->IsViewHScrollBar() ||
pNewPref->getBrowseMode() );
+ pView->ShowHScrollbar( pNewPref->IsViewHScrollBar() ||
pNewPref->getBrowseMode() );
}
- //if only the position of the vertical ruler has been changed initiate an
update
- if(bVAlignChanged && !bHScrollChanged && !bVScrollChanged)
- pView->InvalidateBorder();
+ // if only the position of the vertical ruler has been changed initiate
an update
+ if(bVAlignChanged && !bHScrollChanged && !bVScrollChanged)
+ pView->InvalidateBorder();
- // Lineale an / aus
- if(pNewPref->IsViewVRuler())
- pView->CreateVLineal();
+ // Ruler on / off
+ if(pNewPref->IsViewVRuler())
+ pView->CreateVRuler();
else
- pView->KillVLineal();
+ pView->KillVRuler();
// TabWindow an/aus
- if(pNewPref->IsViewHRuler())
+ if(pNewPref->IsViewHRuler())
pView->CreateTab();
else
pView->KillTab();
@@ -120,7 +117,6 @@ void lcl_SetUIPrefs(const SwViewOption* pPref, SwView*
pView, ViewShell* pSh )
Beschreibung: Aktuelle SwWrtShell
--------------------------------------------------------------------*/
-
SwWrtShell* GetActiveWrtShell()
{
SwView *pActive = ::GetActiveView();
@@ -133,7 +129,6 @@ SwWrtShell* GetActiveWrtShell()
Beschreibung: Pointer auf die aktuelle Sicht
--------------------------------------------------------------------*/
-
SwView* GetActiveView()
{
SfxViewShell* pView = SfxViewShell::Current();
@@ -151,7 +146,6 @@ SwView* SwModule::GetFirstView()
return pView;
}
-
SwView* SwModule::GetNextView(SwView* pView)
{
DBG_ASSERT(PTR_CAST(SwView, pView),"keine SwView uebergeben");
@@ -262,12 +256,12 @@ void SwModule::ApplyUserMetric( FieldUnit eMetric,
sal_Bool bWeb )
FieldUnit eVScrollMetric = pPref->IsVScrollMetric() ?
pPref->GetVScrollMetric() : eMetric;
SwView* pTmpView = SwModule::GetFirstView();
- // fuer alle MDI-Fenster das Lineal umschalten
+ // Switch Ruler for every MDI window
while(pTmpView)
{
if(bWeb == (0 != PTR_CAST(SwWebView, pTmpView)))
{
- pTmpView->ChangeVLinealMetric(eVScrollMetric);
+ pTmpView->ChangeVRulerMetric(eVScrollMetric);
pTmpView->ChangeTabMetric(eHScrollMetric);
}
@@ -306,7 +300,7 @@ void SwModule::ApplyRulerMetric( FieldUnit eMetric,
sal_Bool bHorizontal, sal_Bo
if( bHorizontal )
pTmpView->ChangeTabMetric(eMetric);
else
- pTmpView->ChangeVLinealMetric(eMetric);
+ pTmpView->ChangeVRulerMetric(eMetric);
}
pTmpView = SwModule::GetNextView(pTmpView);
}
@@ -390,8 +384,8 @@ sal_uInt16 SwModule::GetRedlineAuthor()
{
if (!bAuthorInitialised)
{
- const SvtUserOptions& rOpt = GetUserOptions();
- if( !(sActAuthor = rOpt.GetFullName()).Len() )
+ const SvtUserOptions& rOpt = GetUserOptions();
+ if( !(sActAuthor = rOpt.GetFullName()).Len() )
if( !(sActAuthor = rOpt.GetID()).Len() )
sActAuthor = String( SW_RES(
STR_REDLINE_UNKNOWN_AUTHOR ));
bAuthorInitialised = sal_True;
@@ -405,7 +399,7 @@ sal_uInt16 SwModule::GetRedlineAuthor()
const String& SwModule::GetRedlineAuthor(sal_uInt16 nPos)
{
- DBG_ASSERT(nPos<pAuthorNames->Count(), "author not found!"); //#i45342#
RTF doc with no author table caused reader to crash
+ DBG_ASSERT(nPos<pAuthorNames->Count(), "author not found!"); //
#i45342# RTF doc with no author table caused reader to crash
while (!(nPos<pAuthorNames->Count()))
{
InsertRedlineAuthor(String(RTL_CONSTASCII_USTRINGPARAM("nn")));
@@ -498,7 +492,7 @@ void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet
&rSet,
}
if( !bBackGr )
- rSet.Put( SvxColorItem( aCol, RES_CHRATR_COLOR ) );
+ rSet.Put( SvxColorItem( aCol, RES_CHRATR_COLOR ) );
}
/*--------------------------------------------------------------------
@@ -585,7 +579,7 @@ const String& SwModule::GetDocStatWordDelim() const
/* ---------------------------------------------------------------------------
---------------------------------------------------------------------------*/
-// Durchreichen der Metric von der ModuleConfig (fuer HTML-Export)
+// Durchreichen der Metric von der ModuleConfig (für HTML-Export)
sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
{
SwMasterUsrPref* pPref;
@@ -601,7 +595,7 @@ sal_uInt16 SwModule::GetMetric( sal_Bool bWeb ) const
GetUsrPref(sal_False);
pPref = pUsrPref;
}
- return static_cast< sal_uInt16 >(pPref->GetMetric());
+ return static_cast< sal_uInt16 >(pPref->GetMetric());
}
/* ---------------------------------------------------------------------------
@@ -611,7 +605,7 @@ sal_uInt16 SwModule::GetLinkUpdMode( sal_Bool ) const
{
if(!pUsrPref)
GetUsrPref(sal_False);
- return (sal_uInt16)pUsrPref->GetUpdateLinkMode();
+ return (sal_uInt16)pUsrPref->GetUpdateLinkMode();
}
/* ---------------------------------------------------------------------------
@@ -620,7 +614,7 @@ SwFldUpdateFlags SwModule::GetFldUpdateFlags( sal_Bool )
const
{
if(!pUsrPref)
GetUsrPref(sal_False);
- return pUsrPref->GetFldUpdateFlags();
+ return pUsrPref->GetFldUpdateFlags();
}
/* -----------------------------28.09.00 14:18--------------------------------
@@ -629,7 +623,7 @@ void SwModule::ApplyFldUpdateFlags(SwFldUpdateFlags
eFldFlags)
{
if(!pUsrPref)
GetUsrPref(sal_False);
- pUsrPref->SetFldUpdateFlags(eFldFlags);
+ pUsrPref->SetFldUpdateFlags(eFldFlags);
}
/* -----------------------------28.09.00 14:18--------------------------------
@@ -656,14 +650,14 @@ void SwModule::CheckSpellChanges( sal_Bool
bOnlineSpelling,
pDocSh = (SwDocShell*)SfxObjectShell::GetNext(
*pDocSh, &aType ) )
{
SwDoc* pTmp = pDocSh->GetDoc();
- if ( pTmp->GetCurrentViewShell() ) //swmod
071108//swmod 071225
- {
+ if ( pTmp->GetCurrentViewShell() ) // swmod
071108//swmod 071225
+ {
pTmp->SpellItAgainSam( bInvalid, bOnlyWrong,
bSmartTags );
- ViewShell* pViewShell = 0;
- pTmp->GetEditShell( &pViewShell );
- if ( bSmartTags && pViewShell && pViewShell->GetWin() )
- pViewShell->GetWin()->Invalidate();
- }
+ ViewShell* pViewShell = 0;
+ pTmp->GetEditShell( &pViewShell );
+ if ( bSmartTags && pViewShell &&
pViewShell->GetWin() )
+ pViewShell->GetWin()->Invalidate();
+ }
}
// pSpell->SetSpellWrongAgain( sal_False );
// pSpell->SetSpellAllAgain( sal_False );
@@ -672,7 +666,9 @@ void SwModule::CheckSpellChanges( sal_Bool bOnlineSpelling,
void SwModule::ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode)
{
- if(!pUsrPref)
- GetUsrPref(sal_False);
- pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
+ if(!pUsrPref)
+ GetUsrPref(sal_False);
+ pUsrPref->SetDefaultPageMode(bIsSquaredPageMode);
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/docvw/edtwin3.cxx
b/main/sw/source/ui/docvw/edtwin3.cxx
index ba46b2202b..bd7aaf072c 100644
--- a/main/sw/source/ui/docvw/edtwin3.cxx
+++ b/main/sw/source/ui/docvw/edtwin3.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,25 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include <hintids.hxx>
#include <vcl/settings.hxx>
#include <svx/ruler.hxx>
@@ -44,13 +40,10 @@
#include <frmatr.hxx>
#include <editeng/frmdiritem.hxx>
-
/*--------------------------------------------------------------------
Beschreibung: Core-Notify
--------------------------------------------------------------------*/
-
-
void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect,
sal_uInt16 nRangeX, sal_uInt16 nRangeY)
{
@@ -63,8 +56,6 @@ void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect,
Beschreibung: Docmdi - verschiebbar
--------------------------------------------------------------------*/
-
-
sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect )
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -77,8 +68,6 @@ sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect )
Beschreibung: Notify fuer Groessen-Aenderung
--------------------------------------------------------------------*/
-
-
void SizeNotify(ViewShell* pVwSh, const Size &rSize)
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -95,8 +84,6 @@ void SizeNotify(ViewShell* pVwSh, const Size &rSize)
Beschreibung: Notify fuer Seitenzahl-Update
--------------------------------------------------------------------*/
-
-
void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
const String& rPgStr)
{
@@ -113,8 +100,6 @@ void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum,
sal_uInt16 nVirtNum,
* Aenderung :
******************************************************************************/
-
-
void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
{
if ( pVwSh->ISA(SwCrsrShell) )
@@ -126,7 +111,7 @@ void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
--------------------------------------------------------------------*/
sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool
bVerticalMode)
{
- SvxRuler& rRuler = bVerticalMode ? rView.GetVLineal() :
rView.GetHLineal();
+ SvxRuler& rRuler = bVerticalMode ? rView.GetVRuler() : rView.GetHRuler();
return (!rRuler.StartDocDrag( rMEvt, RULER_TYPE_BORDER ) &&
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN1) &&
!rRuler.StartDocDrag( rMEvt, RULER_TYPE_MARGIN2));
@@ -138,7 +123,7 @@ sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent&
rMEvt, sal_Bool bVertical
sal_Bool SwEditWin::RulerMarginDrag( const MouseEvent& rMEvt,
const bool bVerticalMode )
{
- SvxRuler& rRuler = bVerticalMode ? rView.GetVLineal() :
rView.GetHLineal();
+ SvxRuler& rRuler = bVerticalMode ? rView.GetVRuler() : rView.GetHRuler();
return !rRuler.StartDocDrag( rMEvt, RULER_TYPE_INDENT);
}
// <--
@@ -209,15 +194,15 @@ void SwEditWin::DataChanged( const DataChangedEvent&
rDCEvt )
switch( rDCEvt.GetType() )
{
case DATACHANGED_SETTINGS:
- // ScrollBars neu anordnen bzw. Resize ausloesen, da sich
+ // ScrollBars neu anordnen bzw. Resize auslösen, da sich
// ScrollBar-Groesse geaendert haben kann. Dazu muss dann im
// Resize-Handler aber auch die Groesse der ScrollBars aus
// den Settings abgefragt werden.
if( rDCEvt.GetFlags() & SETTINGS_STYLE )
{
- pSh->LockPaint();
+ pSh->LockPaint();
bUnlockPaint = sal_True;
- ViewShell::DeleteReplacementBitmaps();
+ ViewShell::DeleteReplacementBitmaps();
GetView().InvalidateBorder();
//Scrollbarbreiten
}
break;
@@ -226,12 +211,14 @@ void SwEditWin::DataChanged( const DataChangedEvent&
rDCEvt )
case DATACHANGED_DISPLAY:
case DATACHANGED_FONTS:
case DATACHANGED_FONTSUBSTITUTION:
- pSh->LockPaint();
+ pSh->LockPaint();
bUnlockPaint = sal_True;
- GetView().GetDocShell()->UpdateFontList(); //z.B.
Druckerwechsel
+ GetView().GetDocShell()->UpdateFontList(); // z.B.
Druckerwechsel
break;
}
- pSh->LockView( bViewWasLocked );
+ pSh->LockView( bViewWasLocked );
if( bUnlockPaint )
- pSh->UnlockPaint();
+ pSh->UnlockPaint();
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/view.hxx b/main/sw/source/ui/inc/view.hxx
index 5fec6aff49..66ccff7116 100644
--- a/main/sw/source/ui/inc/view.hxx
+++ b/main/sw/source/ui/inc/view.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef _SWVIEW_HXX
#define _SWVIEW_HXX
@@ -121,8 +120,8 @@ enum ShellModes
SHELL_MODE_TABLE_TEXT,
SHELL_MODE_TABLE_LIST_TEXT,
SHELL_MODE_MEDIA,
- SHELL_MODE_EXTRUDED_CUSTOMSHAPE,
- SHELL_MODE_FONTWORK,
+ SHELL_MODE_EXTRUDED_CUSTOMSHAPE,
+ SHELL_MODE_FONTWORK,
SHELL_MODE_POSTIT
};
@@ -143,13 +142,13 @@ struct SwApplyTemplate
int eType;
sal_uInt16 nColor;
- SwFormatClipboard* pFormatClipboard;
+ SwFormatClipboard* pFormatClipboard;
sal_Bool bUndo;
SwApplyTemplate() :
eType(0),
nColor(0),
- pFormatClipboard(0),
+ pFormatClipboard(0),
bUndo(sal_False)
{
aColl.pTxtColl = 0;
@@ -167,7 +166,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
friend void lcl_SelectShellForDrop( SwView &rView );
friend class TestTemplateItem;
- friend class SwHHCWrapper;
+ friend class SwHHCWrapper;
friend class SwHyphWrapper;
friend class SwView_Impl;
friend class SwClipboardChangeListener;
@@ -181,7 +180,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
static sal_uInt16 nInsertObjectCtrlState;
static sal_uInt16 nInsertFieldCtrlState;
static sal_uInt16 nMoveType; // fuer Buttons
unter dem Scrollbar (viewmdi)
- static sal_Int32 nActMark; // aktuelle Sprungmarke fuer unbenannte
Merker
+ static sal_Int32 nActMark; // aktuelle Sprungmarke fuer
unbenannte Merker
static sal_Bool bExtra;
static sal_Bool bFound;
@@ -191,20 +190,20 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
static SearchAttrItemList* pReplList;
- SvxHtmlOptions aHTMLOpt;
- Timer aTimer; //Fuer
verzoegerte ChgLnks waehrend
+ SvxHtmlOptions aHTMLOpt;
+ Timer aTimer; //Für
verzögerte ChgLnks waehrend
//einer Aktion
String aPageStr;
//Statusanzeige, aktuelle Seite
String sSwViewData,
//and the new cursor position if the user double click in the
PagePreView
sNewCrsrPos;
- // to support keyboard the number of the page to go to can be set too
- sal_uInt16 nNewPage;
+ // to support keyboard the number of the page to go to can be set too
+ sal_uInt16 nNewPage;
sal_uInt16 nOldPageNum;
String nOldSectionName;
Point aTabColFromDocPos; //Verschieben
von Tabellenspalten aus
//aus dem Dokument heraus.
- SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule
#i23726#
+ SwTxtNode * pNumRuleNodeFromDoc; // Moving indent of numrule
#i23726#
Size aDocSz; // aktuelle
Dokumentgroesse
Rectangle aVisArea; // sichtbarer
Bereich
@@ -238,27 +237,27 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
const SwFrmFmt *pLastTableFormat;
- SwFormatClipboard *pFormatClipboard; //holds data for format paintbrush
+ SwFormatClipboard *pFormatClipboard; //holds data for format
paintbrush
SwPostItMgr *mpPostItMgr;
int nSelectionType;
- static const int MASTERENUMCOMMANDS = 6;
+ static const int MASTERENUMCOMMANDS = 6;
- String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
+ String aCurrShapeEnumCommand[ MASTERENUMCOMMANDS ];
- sal_uInt16 nPageCnt;
+ sal_uInt16 nPageCnt;
// Aktueller Drawmode
sal_uInt16 nDrawSfxId;
- String sDrawCustom; //some drawing types are marked with strings!
+ String sDrawCustom; //some drawing types are marked with
strings!
sal_uInt16 nFormSfxId;
sal_uInt16 nLastPasteDestination;
- // save the border distance status from SwView::StateTabWin to re-use it
in SwView::ExecTabWin()
- sal_uInt16 nLeftBorderDistance;
- sal_uInt16 nRightBorderDistance;
+ // save the border distance status from SwView::StateTabWin to re-use
it in SwView::ExecTabWin()
+ sal_uInt16 nLeftBorderDistance;
+ sal_uInt16 nRightBorderDistance;
sal_Bool bCenterCrsr : 1,
bTopCrsr : 1,
@@ -514,24 +513,24 @@ public:
void ShowHScrollbar(sal_Bool bShow);
sal_Bool IsHScrollbarVisible()const;
- void ShowVScrollbar(sal_Bool bShow);
- sal_Bool IsVScrollbarVisible()const;
+ void ShowVScrollbar(sal_Bool bShow);
+ sal_Bool IsVScrollbarVisible()const;
- int CreateVLineal();
- int KillVLineal();
- int CreateTab();
- int KillTab();
+ int CreateVRuler();
+ int KillVRuler();
+ int CreateTab();
+ int KillTab();
- int StatVLineal() const { return
((Window*)pVRuler)->IsVisible(); }
- void ChangeVLinealMetric(FieldUnit eUnit);
- void GetVLinealMetric(FieldUnit& rToFill) const;
+ int StatVRuler() const { return
((Window*)pVRuler)->IsVisible(); }
+ void ChangeVRulerMetric(FieldUnit eUnit);
+ void GetVRulerMetric(FieldUnit& rToFill) const;
- int StatTab() const { return ((Window*)pHRuler)->IsVisible(); }
- SvxRuler& GetHLineal() { return *pHRuler; }
- SvxRuler& GetVLineal() { return *pVRuler; }
+ int StatTab() const { return
((Window*)pHRuler)->IsVisible(); }
+ SvxRuler& GetHRuler() { return *pHRuler; }
+ SvxRuler& GetVRuler() { return *pVRuler; }
void InvalidateRulerPos();
void ChangeTabMetric(FieldUnit eUnit);
- void GetHLinealMetric(FieldUnit& rToFill) const;
+ void GetHRulerMetric(FieldUnit& rToFill) const;
// Handler
void Execute(SfxRequest&);
@@ -692,3 +691,5 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent,
sal_Bool bPreview);
#endif
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/ribbar/inputwin.cxx
b/main/sw/source/ui/ribbar/inputwin.cxx
index 04ca57ea4e..909b8cccff 100644
--- a/main/sw/source/ui/ribbar/inputwin.cxx
+++ b/main/sw/source/ui/ribbar/inputwin.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <tools/gen.hxx>
#include <sfx2/imgmgr.hxx>
#include <sfx2/viewfrm.hxx>
@@ -81,11 +78,11 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings*
pBind )
bActive = bIsTable = bDelSel = sal_False;
FreeResource();
-
+
aEdit.SetSizePixel( aEdit.CalcMinimumSize() );
- SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() );
- pManager->RegisterToolBox(this);
+ SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD()
);
+ pManager->RegisterToolBox(this);
pView = ::GetActiveView();
pWrtShell = pView ? pView->GetWrtShellPtr() : 0;
@@ -101,13 +98,13 @@ SwInputWindow::SwInputWindow( Window* pParent,
SfxBindings* pBind )
aEdit.SetAccessibleName(String(SW_RES(STR_ACCESS_FORMULA_TEXT)));
SetHelpId(ED_FORMULA, HID_EDIT_FORMULA);
- sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
- SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC ));
+ sal_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 ));
- SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) |
TIB_DROPDOWNONLY );
- SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
+ SetItemBits( FN_FORMULA_CALC, GetItemBits( FN_FORMULA_CALC ) |
TIB_DROPDOWNONLY );
+ SetDropdownClickHdl( LINK( this, SwInputWindow, DropdownClickHdl ));
Size aSizeTbx = CalcWindowSizePixel();
Size aEditSize = aEdit.GetSizePixel();
@@ -137,20 +134,20 @@ SwInputWindow::SwInputWindow( Window* pParent,
SfxBindings* pBind )
__EXPORT SwInputWindow::~SwInputWindow()
{
- SfxImageManager::GetImageManager( SW_MOD() )->ReleaseToolBox(this);
+ SfxImageManager::GetImageManager( SW_MOD() )->ReleaseToolBox(this);
- //Lineale aufwecken
+ // Activate ruler
if(pView)
{
- pView->GetHLineal().SetActive( sal_True );
- pView->GetVLineal().SetActive( sal_True );
+ pView->GetHRuler().SetActive( sal_True );
+ pView->GetVRuler().SetActive( sal_True );
}
if ( pMgr )
delete pMgr;
if(pWrtShell)
pWrtShell->EndSelTblCells();
- CleanupUglyHackWithUndo();
+ CleanupUglyHackWithUndo();
}
void SwInputWindow::CleanupUglyHackWithUndo()
@@ -178,7 +175,7 @@ void SwInputWindow::DataChanged( const DataChangedEvent&
rDCEvt )
{
if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() &
SETTINGS_STYLE) )
{
- // update item images
+ // update item images
SwModule *pMod = SW_MOD();
SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
sal_Bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -211,14 +208,14 @@ void __EXPORT SwInputWindow::Resize()
void SwInputWindow::ShowWin()
{
bIsTable = sal_False;
- //Lineale anhalten
+ // Stop ruler
if(pView)
{
- pView->GetHLineal().SetActive( sal_False );
- pView->GetVLineal().SetActive( sal_False );
+ pView->GetHRuler().SetActive( sal_False );
+ pView->GetVRuler().SetActive( sal_False );
- DBG_ASSERT(pWrtShell, "Keine WrtShell!");
- // Cursor in Tabelle
+ DBG_ASSERT(pWrtShell, "No WrtShell!");
+ // Cursor in table
bIsTable = pWrtShell->IsCrsrInTbl() ? sal_True : sal_False;
if( bFirst )
@@ -235,7 +232,7 @@ void SwInputWindow::ShowWin()
aAktTableName = pWrtShell->GetTableFmt()->GetName();
}
else
- aPos.SetText(SW_RESSTR(STR_TBL_FORMULA));
+ aPos.SetText(SW_RESSTR(STR_TBL_FORMULA));
// Aktuelles Feld bearbeiten
ASSERT(pMgr == 0, FieldManager nicht geloescht.);
@@ -678,3 +675,5 @@ SfxChildWinInfo __EXPORT SwInputChild::GetInfo() const
SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
return aInfo;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/view.cxx
b/main/sw/source/ui/uiview/view.cxx
index 99a85272d0..dece1ee067 100644
--- a/main/sw/source/ui/uiview/view.cxx
+++ b/main/sw/source/ui/uiview/view.cxx
@@ -19,12 +19,9 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <string> // HACK: prevent conflict between STLPORT and Workshop
headers
#include <stdlib.h>
#include <hintids.hxx>
@@ -110,7 +107,6 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -118,7 +114,6 @@ using namespace ::com::sun::star::scanner;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-
extern sal_Bool bNoInterrupt; // in mainwn.cxx
#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \
@@ -248,9 +243,7 @@ IMPL_LINK( SwView, FormControlActivated, FmFormShell*,
EMPTYARG )
void SwView::SelectShell()
{
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-//
// Achtung: SelectShell fuer die WebView mitpflegen
-//
//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
if(bInDtor)
@@ -893,7 +886,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
const bool bIsDocModified = pWrtShell->GetDoc()->IsModified();
// <--
- // JP 05.02.99: Bug 61495 - damit unter anderem das HLineal im
+ // JP 05.02.99: Bug 61495 - damit unter anderem der HRuler im
// ReadonlyFall nicht angezeigt wird
aUsrPref.SetReadonly( pWrtShell->GetViewOptions()->IsReadonly() );
@@ -923,7 +916,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
StartListening( *pViewFrame, sal_True );
StartListening( *pDocSh, sal_True );
- // Vom HLineal den ZOOM-Faktor einstellen
+ // Vom HRuler den ZOOM-Faktor einstellen
Fraction aZoomFract( aUsrPref.GetZoom(), 100 );
pHRuler->SetZoom( aZoomFract );
pVRuler->SetZoom( aZoomFract );
@@ -967,7 +960,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh
)
if( aUsrPref.IsViewHRuler() )
CreateTab();
if( aUsrPref.IsViewVRuler() )
- CreateVLineal();
+ CreateVRuler();
pWrtShell->SetUIOptions( aUsrPref );
pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() );
@@ -1665,9 +1658,9 @@ void SwView::Notify( SfxBroadcaster& rBC, const SfxHint&
rHint )
rSh.SetReadonlyOption(
GetDocShell()->IsReadOnly() );
if ( rSh.GetViewOptions()->IsViewVRuler() )
- CreateVLineal();
+ CreateVRuler();
else
- KillVLineal();
+ KillVRuler();
if ( rSh.GetViewOptions()->IsViewHRuler() )
CreateTab();
else
@@ -1760,7 +1753,6 @@ void SwView::ScannerEventHdl( const EventObject&
/*rEventObject*/ )
--------------------------------------------------*/
-
void SwView::StopShellTimer()
{
if(aTimer.IsActive())
@@ -1899,3 +1891,5 @@ void InitPrintOptionsFromApplication(SwPrintData &
o_rData, bool const bWeb)
}
} // namespace sw
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/view0.cxx
b/main/sw/source/ui/uiview/view0.cxx
index c5b2c2ddff..536f22bf37 100644
--- a/main/sw/source/ui/uiview/view0.cxx
+++ b/main/sw/source/ui/uiview/view0.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,25 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include "hintids.hxx"
#include <vcl/graph.hxx>
#include <svx/galbrws.hxx>
@@ -336,7 +332,7 @@ void SwView::StateViewOptions(SfxItemSet &rSet)
case FN_VIEW_SMOOTH_SCROLL:
aBool.SetValue( pOpt->IsSmoothScroll()); break;
case FN_VLINEAL:
- aBool.SetValue( 0 != StatVLineal() ); break;
+ aBool.SetValue( 0 != StatVRuler() ); break;
case FN_HSCROLLBAR:
if( pOpt->getBrowseMode() )
{
@@ -447,7 +443,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
bBrowseModeChanged = bFlag != pOpt->getBrowseMode();
// Disable "multiple layout"
GetDocShell()->ToggleBrowserMode( bFlag, this );
-
+
pOpt->setBrowseMode( bFlag );
break;
@@ -596,29 +592,31 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
if( !bModified )
rSh.ResetModified();
- pModule->ApplyUsrPref( *pOpt, this, bWebView ? VIEWOPT_DEST_WEB :
VIEWOPT_DEST_TEXT );
+ pModule->ApplyUsrPref( *pOpt, this, bWebView ? VIEWOPT_DEST_WEB :
VIEWOPT_DEST_TEXT );
//mod #i6193# let postits know about new spellcheck setting
- if ( nSlot == SID_AUTOSPELL_CHECK )
+ if ( nSlot == SID_AUTOSPELL_CHECK )
GetPostItMgr()->SetSpellChecking();
- const sal_Bool bLockedView = rSh.IsViewLocked();
- rSh.LockView( sal_True ); //lock visible section
- GetWrtShell().EndAction();
- if( bBrowseModeChanged && !bFlag )
- CalcVisArea( GetEditWin().GetOutputSizePixel() );
- rSh.LockView( bLockedView );
-
- delete pOpt;
- Invalidate(rReq.GetSlot());
- if(!pArgs)
- rReq.AppendItem(SfxBoolItem(nSlot, (sal_Bool)bFlag));
- rReq.Done();
+ const sal_Bool bLockedView = rSh.IsViewLocked();
+ rSh.LockView( sal_True ); //lock visible section
+ GetWrtShell().EndAction();
+ if( bBrowseModeChanged && !bFlag )
+ CalcVisArea( GetEditWin().GetOutputSizePixel() );
+ rSh.LockView( bLockedView );
+
+ delete pOpt;
+ Invalidate(rReq.GetSlot());
+ if(!pArgs)
+ rReq.AppendItem(SfxBoolItem(nSlot, (sal_Bool)bFlag));
+ rReq.Done();
}
IMPL_LINK( SwView, HtmlOptionsHdl, void*, EMPTYARG )
{
// Invalidierung, falls blinkender Text erlaubt/verboten wurde
- GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
- return 0;
+ GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
+ return 0;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/viewfunc.hxx
b/main/sw/source/ui/uiview/viewfunc.hxx
index 89017d363c..f95692496b 100644
--- a/main/sw/source/ui/uiview/viewfunc.hxx
+++ b/main/sw/source/ui/uiview/viewfunc.hxx
@@ -52,8 +52,8 @@ void ViewResizePixel( const Window &rRef,
ImageButton* pPageDownBtn,
ImageButton* pNaviBtn,
Window& rScrollBarBox,
- SvxRuler* pVLineal = 0,
- SvxRuler* pHLineal = 0,
+ SvxRuler* pVRuler = 0,
+ SvxRuler* pHRuler = 0,
sal_Bool bWebView = sal_False,
sal_Bool bVRulerRight = sal_False );
diff --git a/main/sw/source/ui/uiview/viewmdi.cxx
b/main/sw/source/ui/uiview/viewmdi.cxx
index 2b7aac9166..40dec9eb38 100644
--- a/main/sw/source/ui/uiview/viewmdi.cxx
+++ b/main/sw/source/ui/uiview/viewmdi.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,25 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
#include <string> // HACK: prevent conflict between STLPORT and Workshop
headers
#include "hintids.hxx"
@@ -82,7 +78,6 @@
sal_uInt16 SwView::nMoveType = NID_PGE;
sal_Int32 SwView::nActMark = 0;
-
#define VIEW_IMAGECOLOR COL_LIGHTBLUE
using namespace ::com::sun::star::uno;
@@ -175,8 +170,8 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType
eZoomType,
SwViewOption aOpt( *pOpt );
if ( !GetViewFrame()->GetFrame().IsInPlace() )
{
- //MasterUsrPrefs updaten UND DANACH die ViewOptions der
aktuellen
- //View updaten.
+ // MasterUsrPrefs updaten UND DANACH die ViewOptions der
aktuellen
+ // View updaten.
if ( !bViewOnly &&
(sal_uInt16(nFac) !=
pUsrPref->GetZoom() ||
sal_uInt8 (eZoomType) !=
pUsrPref->GetZoomType()) )
@@ -202,8 +197,8 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType
eZoomType,
aPos.Y() = pWrtShell->GetAnyCurRect(RECT_PAGE).Top() -
DOCUMENTBORDER;
else
{
- //sicherstellen, dass sich der Cursor im sichtbaren
- //Bereich befindet, damit nur 1x gescrollt wird
+ // sicherstellen, dass sich der Cursor im sichtbaren
+ // Bereich befindet, damit nur 1x gescrollt wird
aPos.X() = lLeftMargin;
const SwRect &rCharRect = pWrtShell->GetCharRect();
if ( rCharRect.Top() > GetVisArea().Bottom() ||
@@ -217,7 +212,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType
eZoomType,
// OS: Notloesung - in CalcVisArea wird u.U. wieder SetZoom
gerufen und
// dann werden falsche Werte eingestellt
((SwViewOption*)pWrtShell->GetViewOptions())->SetZoomType( eZoomType );
- CalcVisArea( rEditSize ); //fuer das Neuberechnen des
sichtbaren Bereiches
+ CalcVisArea( rEditSize ); // für das Neuberechnen des
sichtbaren Bereiches
}
else if ( sal_uInt16(nFac) != pOpt->GetZoom() )
{
@@ -261,8 +256,8 @@ void SwView::SetViewLayout( sal_uInt16 nColumns, bool
bBookMode, sal_Bool bViewO
const sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
SwMasterUsrPref *pUsrPref =
(SwMasterUsrPref*)SW_MOD()->GetUsrPref(bWeb);
- //MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen
- //View updaten.
+ // MasterUsrPrefs updaten UND DANACH die ViewOptions der aktuellen
+ // View updaten.
if ( nColumns != pUsrPref->GetViewLayoutColumns() ||
bBookMode != pUsrPref->IsViewLayoutBookMode() )
{
@@ -324,13 +319,13 @@ int SwView::_CreateScrollbar( sal_Bool bHori )
(*ppScrollbar)->EnableDrag( sal_True );
- if(GetWindow())
- InvalidateBorder();
+ if(GetWindow())
+ InvalidateBorder();
// Scrollbar muss nochmals getestet werden, da im InvalidateBorder u.U.
der
// Scrollbar wieder geloescht wurde
if ( !bShowAtResize && (*ppScrollbar))
- (*ppScrollbar)->ExtendedShow();
+ (*ppScrollbar)->ExtendedShow();
return 1;
}
@@ -342,8 +337,8 @@ void SwView::CreatePageButtons(sal_Bool bShow)
pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP);
pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ),
sal_False );
pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN);
- Reference< XFrame > xFrame =
GetViewFrame()->GetFrame().GetFrameInterface();
- pNaviBtn = new SwNaviImageButton(pMDI, xFrame );
+ Reference< XFrame > xFrame =
GetViewFrame()->GetFrame().GetFrameInterface();
+ pNaviBtn = new SwNaviImageButton(pMDI, xFrame );
pNaviBtn->SetHelpId(HID_SCRL_NAVI);
Link aLk( LINK( this, SwView, BtnPage ) );
pPageUpBtn->SetClickHdl( aLk );
@@ -367,9 +362,9 @@ void SwView::CreatePageButtons(sal_Bool bShow)
*/
IMPL_LINK( SwView, BtnPage, Button *, pButton )
{
- // #i75416# move the execution of the search to an asynchronously called
static link
- bool* pbNext = new bool( (pButton == pPageDownBtn) );
- Application::PostUserEvent( STATIC_LINK(this, SwView, MoveNavigationHdl),
pbNext );
+ // #i75416# move the execution of the search to an asynchronously
called static link
+ bool* pbNext = new bool( (pButton == pPageDownBtn) );
+ Application::PostUserEvent( STATIC_LINK(this, SwView,
MoveNavigationHdl), pbNext );
return 0;
}
/*-----------------20.06.97 10:46-------------------
@@ -571,7 +566,7 @@ void SwView::ChangeTabMetric( FieldUnit eUnit )
}
}
-void SwView::ChangeVLinealMetric( FieldUnit eUnit )
+void SwView::ChangeVRulerMetric( FieldUnit eUnit )
{
if(pVRuler->GetUnit() != eUnit)
{
@@ -582,27 +577,27 @@ void SwView::ChangeVLinealMetric( FieldUnit eUnit )
/* -----------------------------07.04.01 17:09--------------------------------
---------------------------------------------------------------------------*/
-void SwView::GetVLinealMetric(FieldUnit& eToFill) const
+void SwView::GetVRulerMetric(FieldUnit& eToFill) const
{
eToFill = pVRuler->GetUnit();
}
/* -----------------------------07.04.01 17:09--------------------------------
---------------------------------------------------------------------------*/
-void SwView::GetHLinealMetric(FieldUnit& eToFill) const
+void SwView::GetHRulerMetric(FieldUnit& eToFill) const
{
eToFill = pHRuler->GetUnit();
}
/*************************************************************************
|*
-|* SwView::CreateVLineal()
+|* SwView::CreateVRuler()
|*
|* Beschreibung
|* Ersterstellung VB 29.05.91
|*
*************************************************************************/
-int SwView::CreateVLineal()
+int SwView::CreateVRuler()
{
pHRuler->SetBorderPos( pVRuler->GetSizePixel().Width()-1 );
@@ -614,14 +609,14 @@ int SwView::CreateVLineal()
/*************************************************************************
|*
-|* SwView::KillVLineal()
+|* SwView::KillVRuler()
|*
|* Beschreibung
|* Ersterstellung VB 29.05.91
|*
*************************************************************************/
-int SwView::KillVLineal()
+int SwView::KillVRuler()
{
pVRuler->Hide();
pHRuler->SetBorderPos( 0 );
@@ -748,3 +743,5 @@ sal_Bool SwView::IsVScrollbarVisible()const
DBG_ASSERT(pVScrollbar, "Scrollbar invalid");
return pVScrollbar->IsVisible( sal_False );
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/viewport.cxx
b/main/sw/source/ui/uiview/viewport.cxx
index da06dec036..da8ef0f830 100644
--- a/main/sw/source/ui/uiview/viewport.cxx
+++ b/main/sw/source/ui/uiview/viewport.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include "hintids.hxx"
#include <vcl/help.hxx>
#include <svx/ruler.hxx>
@@ -118,7 +115,7 @@ void lcl_GetPos(SwView* pView,
}
/*--------------------------------------------------------------------
- Beschreibung: Nullpunkt Lineal setzen
+ Beschreibung: Nullpunkt Ruler setzen
--------------------------------------------------------------------*/
void SwView::InvalidateRulerPos()
@@ -136,7 +133,7 @@ void SwView::InvalidateRulerPos()
GetViewFrame()->GetBindings().Invalidate(aInval);
- DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?");
+ DBG_ASSERT(pHRuler, "Why is there no Ruler?");
pHRuler->ForceUpdate();
pVRuler->ForceUpdate();
}
@@ -866,7 +863,7 @@ void SwView::CalcAndSetBorderPixel( SvBorder &rToFill,
sal_Bool /*bInner*/ )
rToFill.Left() = nWidth;
}
- DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?");
+ DBG_ASSERT(pHRuler, "Why is there no Ruler?");
if ( pHRuler->IsVisible() )
rToFill.Top() = pHRuler->GetSizePixel().Height();
@@ -899,19 +896,19 @@ void ViewResizePixel( const Window &rRef,
ImageButton* pPageDownBtn,
ImageButton* pNaviBtn,
Window& rScrollBarBox,
- SvxRuler* pVLineal,
- SvxRuler* pHLineal,
+ SvxRuler* pVRuler,
+ SvxRuler* pHRuler,
sal_Bool bWebView,
sal_Bool bVRulerRight )
{
// ViewResizePixel wird auch von der PreView benutzt!!!
- const sal_Bool bHLineal = pHLineal && pHLineal->IsVisible();
- const long nHLinSzHeight = bHLineal ?
-
pHLineal->GetSizePixel().Height() : 0;
- const sal_Bool bVLineal = pVLineal && pVLineal->IsVisible();
- const long nVLinSzWidth = bVLineal ?
-
pVLineal->GetSizePixel().Width() : 0;
+ const sal_Bool bHRuler = pHRuler && pHRuler->IsVisible();
+ const long nHLinSzHeight = bHRuler ?
+
pHRuler->GetSizePixel().Height() : 0;
+ const sal_Bool bVRuler = pVRuler && pVRuler->IsVisible();
+ const long nVLinSzWidth = bVRuler ?
+ pVRuler->GetSizePixel().Width()
: 0;
long nHBSzHeight2= rHScrollbar.IsVisible( sal_False ) ||
!rHScrollbar.IsAuto() ?
rRef.GetSettings().GetStyleSettings().GetScrollBarSize() : 0;
long nHBSzHeight =
@@ -920,9 +917,9 @@ void ViewResizePixel( const Window &rRef,
long nVBSzWidth = rVScrollbar.IsVisible(sal_True) ||
(rVScrollbar.IsVisible( sal_False ) && !rVScrollbar.IsAuto()) ?
rRef.GetSettings().GetStyleSettings().GetScrollBarSize() : 0;
- if(pVLineal)
+ if(pVRuler)
{
- WinBits nStyle = pVLineal->GetStyle()&~WB_RIGHT_ALIGNED;
+ WinBits nStyle = pVRuler->GetStyle()&~WB_RIGHT_ALIGNED;
Point aPos( rOfst.X(), rOfst.Y()+nHLinSzHeight );
if(bVRulerRight)
{
@@ -931,25 +928,25 @@ void ViewResizePixel( const Window &rRef,
}
Size aSize( nVLinSzWidth, rEditSz.Height() );
if(!aSize.Width())
- aSize.Width() = pVLineal->GetSizePixel().Width();
- pVLineal->SetStyle(nStyle);
- pVLineal->SetPosSizePixel( aPos, aSize );
- if(!pVLineal->IsVisible())
- pVLineal->Resize();
- }
-// Lineal braucht ein Resize, sonst funktioniert es nicht im unischtbaren
Zustand
- if(pHLineal)
- {
+ aSize.Width() = pVRuler->GetSizePixel().Width();
+ pVRuler->SetStyle(nStyle);
+ pVRuler->SetPosSizePixel( aPos, aSize );
+ if(!pVRuler->IsVisible())
+ pVRuler->Resize();
+ }
+// Ruler braucht ein Resize, sonst funktioniert es nicht im unischtbaren
Zustand
+ if(pHRuler)
+ {
Size aSize( rSize.Width(), nHLinSzHeight );
- if ( nVBSzWidth && !bVRulerRight)
+ if ( nVBSzWidth && !bVRulerRight)
aSize.Width() -= nVBSzWidth;
if(!aSize.Height())
- aSize.Height() = pHLineal->GetSizePixel().Height();
- pHLineal->SetPosSizePixel( rOfst, aSize );
+ aSize.Height() = pHRuler->GetSizePixel().Height();
+ pHRuler->SetPosSizePixel( rOfst, aSize );
// #46802 VCL ruft an unsichtbaren Fenstern kein Resize
-// fuer das Lineal ist das aber keine gute Idee
- if(!pHLineal->IsVisible())
- pHLineal->Resize();
+// für den Ruler ist das aber keine gute Idee
+ if(!pHRuler->IsVisible())
+ pHRuler->Resize();
}
// Scrollbars und SizeBox anordnen
@@ -975,7 +972,7 @@ void ViewResizePixel( const Window &rRef,
if(bVRulerRight)
{
aPos.X() = rOfst.X();
- if(bHLineal)
+ if(bHRuler)
{
aPos.Y() += nHLinSzHeight;
aSize.Height() -= nHLinSzHeight;
@@ -1109,14 +1106,14 @@ void SwView::InnerResizePixel( const Point &rOfst,
const Size &rSize )
bRepeat = sal_True;
}while( bRepeat );
bProtectDocShellVisArea = sal_False;
- bInInnerResizePixel = sal_False;
+ bInInnerResizePixel = sal_False;
}
void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
{
- // FME 22.08.2003 #i16909# - return, if no size (caused by minimize
window).
- if ( bInOuterResizePixel || ( !rSize.Width() && !rSize.Height() ) )
+ // FME 22.08.2003 #i16909# - return, if no size (caused by minimize
window).
+ if ( bInOuterResizePixel || ( !rSize.Width() && !rSize.Height() ) )
return;
bInOuterResizePixel = sal_True;
@@ -1173,8 +1170,8 @@ void SwView::OuterResizePixel( const Point &rOfst, const
Size &rSize )
do {
++nCnt;
- const sal_Bool bScroll1 = pVScrollbar->IsVisible(sal_True);
- const sal_Bool bScroll2 = pHScrollbar->IsVisible(sal_True);
+ const sal_Bool bScroll1 = pVScrollbar->IsVisible(sal_True);
+ const sal_Bool bScroll2 = pHScrollbar->IsVisible(sal_True);
SvBorder aBorder;
CalcAndSetBorderPixel( aBorder, sal_False );
const Size aEditSz( GetEditWin().GetOutputSizePixel() );
@@ -1187,7 +1184,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const
Size &rSize )
if ( bShowAtResize )
ShowAtResize();
- if( pHRuler->IsVisible() || pVRuler->IsVisible() )
+ if( pHRuler->IsVisible() || pVRuler->IsVisible() )
InvalidateRulerPos(); //Inhalt invalidieren.
//CursorStack zuruecksetzen, da die Cursorpositionen fuer
PageUp/-Down
@@ -1224,7 +1221,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const
Size &rSize )
//Nicht endlosschleifen. Moeglichst dann stoppen wenn die
//(Auto-)Scrollbars sichtbar sind.
- if ( bRepeat &&
+ if ( bRepeat &&
( nCnt > 10 || ( nCnt > 3 && bHAuto && bAuto ) )
)
{
@@ -1250,7 +1247,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const
Size &rSize )
if( bUnLockView )
pWrtShell->LockView( sal_False );
- bInOuterResizePixel = sal_False;
+ bInOuterResizePixel = sal_False;
if ( mpPostItMgr )
{
@@ -1288,15 +1285,15 @@ Size SwView::GetOptimalSizePixel() const
const SvxLRSpaceItem &rLeftLRSpace = rDesc.GetLeft().GetLRSpace();
aPgSize.Width() += Abs( long(rLeftLRSpace.GetLeft()) -
long(rLRSpace.GetLeft()) );
}
- }
+ }
return GetEditWin().LogicToPixel( aPgSize );
}
sal_Bool SwView::UpdateScrollbars()
{
- sal_Bool bRet = sal_False;
- if ( !aVisArea.IsEmpty() )
+ sal_Bool bRet = sal_False;
+ if ( !aVisArea.IsEmpty() )
{
const sal_Bool bBorder = IsDocumentBorder();
Rectangle aTmpRect( aVisArea );
@@ -1365,7 +1362,7 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent&
rCEvt )
bOk = sal_True;
}
else
- {
+ {
if (pWData && (COMMAND_WHEEL_SCROLL==pWData->GetMode()) &&
(((sal_uLong)0xFFFFFFFF) == pWData->GetScrollLines()))
{
if (pWData->GetDelta()<0)
@@ -1380,3 +1377,5 @@ sal_Bool SwView::HandleWheelCommands( const CommandEvent&
rCEvt )
}
return bOk;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uiview/viewtab.cxx
b/main/sw/source/ui/uiview/viewtab.cxx
index 4b4fdbf60f..d5a3d2582d 100644
--- a/main/sw/source/ui/uiview/viewtab.cxx
+++ b/main/sw/source/ui/uiview/viewtab.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <tools/list.hxx>
#include <hintids.hxx>
@@ -70,17 +67,14 @@
using namespace ::com::sun::star;
-
/*--------------------------------------------------------------------
Beschreibung: Debug-Methode
--------------------------------------------------------------------*/
-
/*--------------------------------------------------------------------
Beschreibung: Columns eintueten
--------------------------------------------------------------------*/
-
void lcl_FillSvxColumn(const SwFmtCol& rCol,
sal_uInt16 nTotalWidth,
SvxColumnItem& rColItem,
@@ -196,18 +190,17 @@ void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
Beschreibung: Seitenrand umdrehen
--------------------------------------------------------------------*/
-
void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
{
- sal_uInt16 nPhyPage, nVirPage;
- GetWrtShell().GetPageNum( nPhyPage, nVirPage );
+ sal_uInt16 nPhyPage, nVirPage;
+ GetWrtShell().GetPageNum( nPhyPage, nVirPage );
- if ( rDesc.GetUseOn() == nsUseOnPage::PD_MIRROR && (nPhyPage % 2) == 0 )
- {
- long nTmp = rLRSpace.GetRight();
- rLRSpace.SetRight( rLRSpace.GetLeft() );
- rLRSpace.SetLeft( nTmp );
- }
+ if ( rDesc.GetUseOn() == nsUseOnPage::PD_MIRROR && (nPhyPage % 2) == 0 )
+ {
+ long nTmp = rLRSpace.GetRight();
+ rLRSpace.SetRight( rLRSpace.GetLeft() );
+ rLRSpace.SetLeft( nTmp );
+ }
}
/*--------------------------------------------------------------------
@@ -215,7 +208,6 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc,
SvxLRSpaceItem& rLRSpace)
Spaltentrenner an der gleichen
absoluten Position bleiben
--------------------------------------------------------------------*/
-
void lcl_Scale(long& nVal, long nScale)
{
nVal *= nScale;
@@ -257,15 +249,14 @@ void ResizeFrameCols(SwFmtCol& rCol,
rArr[0]->SetWishWidth(rArr[0]->GetWishWidth() +
(sal_uInt16)nWishDiff);
else
rArr[rArr.Count()-1]->SetWishWidth(rArr[rArr.Count()-1]->GetWishWidth() +
(sal_uInt16)nWishDiff);
- //reset auto width
- rCol.SetOrtho(sal_False, 0, 0 );
+ //reset auto width
+ rCol.SetOrtho(sal_False, 0, 0 );
}
/*--------------------------------------------------------------------
Beschreibung: Hier werden alle Aenderungen der Tableiste
wieder in das Modell geschossen
--------------------------------------------------------------------*/
-
void SwView::ExecTabWin( SfxRequest& rReq )
{
SwWrtShell &rSh = GetWrtShell();
@@ -1033,7 +1024,6 @@ void SwView::ExecTabWin( SfxRequest& rReq )
werden der Tableiste uebermittelt
--------------------------------------------------------------------*/
-
void SwView::StateTabWin(SfxItemSet& rSet)
{
SwWrtShell &rSh = GetWrtShell();
@@ -1278,7 +1268,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
const SvxTabStopItem& rDefTabs = (const SvxTabStopItem&)
rSh.GetDefault(RES_PARATR_TABSTOP);
- DBG_ASSERT(pHRuler, "warum ist das Lineal nicht da?");
+ DBG_ASSERT(pHRuler, "Why is there no Ruler?");
long nDefTabDist = ::GetTabDist(rDefTabs);
pHRuler->SetDefTabDist( nDefTabDist );
pVRuler->SetDefTabDist( nDefTabDist );
@@ -1330,7 +1320,7 @@ void SwView::StateTabWin(SfxItemSet& rSet)
}
case SID_ATTR_PARA_ULSPACE:
- {
+ {
SvxULSpaceItem aUL = (const
SvxULSpaceItem&)aCoreSet.Get(RES_UL_SPACE);
aUL.SetWhich(nWhich);
@@ -1904,8 +1894,8 @@ void SwView::StateTabWin(SfxItemSet& rSet)
if ( IsTabColFromDoc() )
bColumn = rSh.GetCurMouseColNum( aTabColFromDocPos )
!= 0;
else
- bColumn = (nFrmType &
(FRMTYPE_COLUMN|FRMTYPE_FLY_ANY|FRMTYPE_COLSECTOUTTAB))
- ? sal_True
+ bColumn = (nFrmType &
(FRMTYPE_COLUMN|FRMTYPE_FLY_ANY|FRMTYPE_COLSECTOUTTAB))
+ ? sal_True
: sal_False;
if ( !bColumn )
{
@@ -2063,3 +2053,5 @@ void SwView::StateTabWin(SfxItemSet& rSet)
rSet.Put(aProtect);
}
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/uno/unomod.cxx b/main/sw/source/ui/uno/unomod.cxx
index 09f7b301b7..64a60fdb7c 100644
--- a/main/sw/source/ui/uno/unomod.cxx
+++ b/main/sw/source/ui/uno/unomod.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
#include <swtypes.hxx>
#include <tools/debug.hxx>
#include <unomod.hxx>
@@ -775,8 +772,8 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
break;
case HANDLE_VIEWSET_ONLINE_LAYOUT :
{
- if( pView && !bVal !=
!pView->GetWrtShell().GetViewOptions()->getBrowseMode() )
- {
+ if( pView && !bVal !=
!pView->GetWrtShell().GetViewOptions()->getBrowseMode() )
+ {
SwViewOption aOpt(
*pView->GetWrtShell().GetViewOptions() );
aOpt.setBrowseMode( bVal );
pView->GetWrtShell().ApplyViewOptions( aOpt );
@@ -787,7 +784,7 @@ void SwXViewSettings::_setSingleValue( const
comphelper::PropertyInfo & rInfo, c
// disable multiple layout
pView->GetDocShell()->ToggleBrowserMode(bVal,
pView );
- }
+ }
}
break;
case HANDLE_VIEWSET_HELP_URL :
@@ -852,7 +849,7 @@ void SwXViewSettings::_postSetValues ()
if(mbApplyHRulerMetric)
pView->ChangeTabMetric((FieldUnit)eHRulerUnit);
if(mbApplyVRulerMetric)
- pView->ChangeVLinealMetric((FieldUnit)eVRulerUnit);
+ pView->ChangeVRulerMetric((FieldUnit)eVRulerUnit);
}
else
@@ -864,7 +861,7 @@ void SwXViewSettings::_postSetValues ()
}
- SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ?
VIEWOPT_DEST_VIEW_ONLY
+ SW_MOD()->ApplyUsrPref( *mpViewOption, pView, pView ?
VIEWOPT_DEST_VIEW_ONLY
: bWeb ? VIEWOPT_DEST_WEB
: VIEWOPT_DEST_TEXT );
@@ -892,32 +889,32 @@ void SwXViewSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo, u
sal_Bool bBoolVal;
switch( rInfo.mnHandle )
{
- case HANDLE_VIEWSET_SHOW_RULER: bBoolVal =
mpConstViewOption->IsViewAnyRuler(); break;
- case HANDLE_VIEWSET_HRULER : bBoolVal =
mpConstViewOption->IsViewHRuler(sal_True); break;
- case HANDLE_VIEWSET_VRULER : bBoolVal =
mpConstViewOption->IsViewVRuler(sal_True);break;
- case HANDLE_VIEWSET_VRULER_RIGHT : bBoolVal =
mpConstViewOption->IsVRulerRight();break;
- case HANDLE_VIEWSET_HSCROLL: bBoolVal =
mpConstViewOption->IsViewHScrollBar();break;
+ case HANDLE_VIEWSET_SHOW_RULER: bBoolVal =
mpConstViewOption->IsViewAnyRuler(); break;
+ case HANDLE_VIEWSET_HRULER : bBoolVal =
mpConstViewOption->IsViewHRuler(sal_True); break;
+ case HANDLE_VIEWSET_VRULER : bBoolVal =
mpConstViewOption->IsViewVRuler(sal_True);break;
+ case HANDLE_VIEWSET_VRULER_RIGHT : bBoolVal =
mpConstViewOption->IsVRulerRight();break;
+ case HANDLE_VIEWSET_HSCROLL: bBoolVal =
mpConstViewOption->IsViewHScrollBar();break;
case HANDLE_VIEWSET_VSCROLL:
bBoolVal = mpConstViewOption->IsViewVScrollBar();break;
case HANDLE_VIEWSET_GRAPHICS : bBoolVal =
mpConstViewOption->IsGraphic();break;
case HANDLE_VIEWSET_TABLES : bBoolVal =
mpConstViewOption->IsTable(); break;
case HANDLE_VIEWSET_DRAWINGS : bBoolVal =
mpConstViewOption->IsDraw(); break;
case HANDLE_VIEWSET_FIELD_COMMANDS : bBoolVal =
mpConstViewOption->IsFldName(); break;
case HANDLE_VIEWSET_ANNOTATIONS : bBoolVal =
mpConstViewOption->IsPostIts(); break;
- case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal =
SwViewOption::IsFieldShadings(); break;
- case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: bBoolVal =
mpConstViewOption->IsViewMetaChars(); break;
- case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : bBoolVal =
SwViewOption::IsFieldShadings(); break;
- case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : bBoolVal =
SwViewOption::IsFieldShadings(); break;
+ case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : bBoolVal =
SwViewOption::IsFieldShadings(); break;
+ case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: bBoolVal =
mpConstViewOption->IsViewMetaChars(); break;
+ case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : bBoolVal =
SwViewOption::IsFieldShadings(); break;
+ case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : bBoolVal =
SwViewOption::IsFieldShadings(); break;
case HANDLE_VIEWSET_PARA_BREAKS : bBoolVal =
mpConstViewOption->IsParagraph(sal_True); break;
case HANDLE_VIEWSET_SOFT_HYPHENS : bBoolVal =
mpConstViewOption->IsSoftHyph(); break;
case HANDLE_VIEWSET_SPACES : bBoolVal =
mpConstViewOption->IsBlank(sal_True); break;
case HANDLE_VIEWSET_PROTECTED_SPACES : bBoolVal =
mpConstViewOption->IsHardBlank(); break;
case HANDLE_VIEWSET_TABSTOPS : bBoolVal =
mpConstViewOption->IsTab(sal_True); break;
case HANDLE_VIEWSET_BREAKS : bBoolVal =
mpConstViewOption->IsLineBreak(sal_True); break;
- case HANDLE_VIEWSET_HIDDEN_TEXT : bBoolVal =
mpConstViewOption->IsShowHiddenField(); break;
+ case HANDLE_VIEWSET_HIDDEN_TEXT : bBoolVal =
mpConstViewOption->IsShowHiddenField(); break;
case HANDLE_VIEWSET_HIDDEN_CHARACTERS : bBoolVal =
mpConstViewOption->IsShowHiddenChar(sal_True); break;
case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : bBoolVal =
mpConstViewOption->IsShowHiddenPara(); break;
- case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal =
SwViewOption::IsTableBoundaries(); break;
- case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal =
SwViewOption::IsDocBoundaries(); break;
+ case HANDLE_VIEWSET_TABLE_BOUNDARIES : bBoolVal =
SwViewOption::IsTableBoundaries(); break;
+ case HANDLE_VIEWSET_TEXT_BOUNDARIES : bBoolVal =
SwViewOption::IsDocBoundaries(); break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : bBoolVal =
mpConstViewOption->IsSmoothScroll(); break;
case HANDLE_VIEWSET_SOLID_MARK_HANDLES : bBoolVal =
mpConstViewOption->IsSolidMarkHdl(); break;
case HANDLE_VIEWSET_SHOW_CONTENT_TIPS : bBoolVal =
mpConstViewOption->IsShowContentTips(); break;
@@ -974,7 +971,7 @@ void SwXViewSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo, u
break;
case HANDLE_VIEWSET_ONLINE_LAYOUT:
if(pView)
- bBoolVal =
pView->GetWrtShell().GetViewOptions()->getBrowseMode();
+ bBoolVal =
pView->GetWrtShell().GetViewOptions()->getBrowseMode();
break;
case HANDLE_VIEWSET_HELP_URL :
{
@@ -996,7 +993,7 @@ void SwXViewSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo, u
if ( pView )
{
FieldUnit eUnit;
- pView->GetHLinealMetric( eUnit );
+ pView->GetHRulerMetric( eUnit );
rValue <<= (sal_Int32)eUnit;
}
else
@@ -1012,7 +1009,7 @@ void SwXViewSettings::_getSingleValue( const
comphelper::PropertyInfo & rInfo, u
if ( pView )
{
FieldUnit eUnit;
- pView->GetVLinealMetric( eUnit );
+ pView->GetVRulerMetric( eUnit );
rValue <<= (sal_Int32)eUnit;
}
else
@@ -1051,3 +1048,5 @@ Sequence< OUString >
SwXViewSettings::getSupportedServiceNames(void) throw( Runt
pArray[0] = C2U("com.sun.star.text.ViewSettings");
return aRet;
}
+
+/* vim: set noet sw=4 ts=4: */
