You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2022/03/15 14:55:13 UTC
[openoffice] branch AOO42X updated: Fixed typo (menue -> menu) and some more
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 dd7ece3 Fixed typo (menue -> menu) and some more
dd7ece3 is described below
commit dd7ece3ad95b0888bd87fad1c91aedcd82500db8
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Mar 15 15:48:45 2022 +0100
Fixed typo (menue -> menu) and some more
(cherry picked from commit 4893698d5b64425c479ba652e38e9a3c1586ffeb)
---
main/vcl/inc/salinst.hxx | 16 +--
main/vcl/inc/svdata.hxx | 28 ++--
main/vcl/inc/vcl/menu.hxx | 35 +++--
main/vcl/os2/source/window/salmenu.cxx | 6 +-
main/vcl/source/window/decoview.cxx | 27 ++--
main/vcl/source/window/floatwin.cxx | 51 ++++---
main/vcl/source/window/menu.cxx | 242 ++++++++++++++++-----------------
main/vcl/source/window/window.cxx | 153 +++++++++++----------
main/vcl/source/window/winproc.cxx | 32 ++---
9 files changed, 293 insertions(+), 297 deletions(-)
diff --git a/main/vcl/inc/salinst.hxx b/main/vcl/inc/salinst.hxx
index 59e8c2f..4db2e87 100644
--- a/main/vcl/inc/salinst.hxx
+++ b/main/vcl/inc/salinst.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -96,7 +96,7 @@ public:
// Printer
// pSetupData->mpDriverData can be 0
- // pSetupData must be updatet with the current
+ // pSetupData must be updated with the current
// JobSetup
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ) = 0;
@@ -131,7 +131,7 @@ public:
virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0;
virtual bool AnyInput( sal_uInt16 nType ) = 0;
- // Menues
+ // Menus
virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pMenu );
virtual void DestroyMenu( SalMenu* pMenu);
virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData );
@@ -151,12 +151,12 @@ public:
enum ConnectionIdentifierType { AsciiCString, Blob };
virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0;
-
+
// this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_*
// this is only necessary because PrintFontManager is an exported vcl API and therefore
// needs to be in libvcl while libvclplug_* do not contain exported C++ API
virtual void FillFontPathList( std::list< rtl::OString >& o_rFontPaths );
-
+
// dtrans implementation
virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
diff --git a/main/vcl/inc/svdata.hxx b/main/vcl/inc/svdata.hxx
index b1da853..35405df 100644
--- a/main/vcl/inc/svdata.hxx
+++ b/main/vcl/inc/svdata.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -174,7 +174,7 @@ struct ImplSVAppData
// in window arrangers
bool mbConversionMode; // true allows further optimizations during document conversion in different code areas.
-
+
/** Controls whether showing any IME status window is toggled on or off.
Only meaningful if showing IME status windows can be toggled on and off
@@ -184,7 +184,7 @@ struct ImplSVAppData
long m_bEnableAccessInterface;
DECL_STATIC_LINK( ImplSVAppData, ImplQuitMsg, void* );
-
+
};
@@ -207,7 +207,7 @@ struct ImplSVGDIData
ImplPrnQueueList* mpPrinterQueueList; // List of all printer queue
ImplDevFontList* mpScreenFontList; // Screen-Font-List
ImplFontCache* mpScreenFontCache; // Screen-Font-Cache
- ImplDirectFontSubstitution* mpDirectFontSubst;// Font-Substitutons defined in Tools->Options->Fonts
+ ImplDirectFontSubstitution* mpDirectFontSubst;// Font-Substitutions defined in Tools - Options - OpenOffice - Fonts
GraphicConverter* mpGrfConverter; // Converter for graphics
long mnRealAppFontX; // AppFont X-Numenator for 40/tel Width
long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX
@@ -245,7 +245,7 @@ struct ImplSVWinData
sal_uInt16 mnTrackFlags; // tracking flags
sal_uInt16 mnAutoScrollFlags; // auto scroll flags
sal_Bool mbNoDeactivate; // sal_True: keine Deactivate durchfuehren
- sal_Bool mbNoSaveFocus; // sal_True: menues must not save/restore focus
+ sal_Bool mbNoSaveFocus; // sal_True: menus must not save/restore focus
sal_Bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant
};
@@ -261,10 +261,10 @@ struct ImplSVCtrlData
ImageList* mpCheckImgList; // ImageList for CheckBoxes
ImageList* mpRadioImgList; // ImageList for RadioButtons
ImageList* mpPinImgList; // ImageList for PIN
- ImageList* mpSplitHPinImgList; // ImageList for Horizontale SplitWindows
- ImageList* mpSplitVPinImgList; // ImageList for Vertikale SplitWindows (PIN's)
- ImageList* mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows)
- ImageList* mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows)
+ ImageList* mpSplitHPinImgList; // ImageList for Horizontal SplitWindows
+ ImageList* mpSplitVPinImgList; // ImageList for Vertical SplitWindows (PIN's)
+ ImageList* mpSplitHArwImgList; // ImageList for Horizontal SplitWindows (Arrows)
+ ImageList* mpSplitVArwImgList; // ImageList for Vertical SplitWindows (Arrows)
Image* mpDisclosurePlus;
Image* mpDisclosurePlusHC;
Image* mpDisclosureMinus;
@@ -415,9 +415,9 @@ FieldUnitStringList* ImplGetCleanedFieldUnits();
// Empty-SV-String
-inline const String& ImplGetSVEmptyStr()
+inline const String& ImplGetSVEmptyStr()
{ return String::EmptyString(); }
-inline const ByteString& ImplGetSVEmptyByteStr()
+inline const ByteString& ImplGetSVEmptyByteStr()
{ return ByteString::EmptyString(); }
// -----------------------------------------------------------------------
diff --git a/main/vcl/inc/vcl/menu.hxx b/main/vcl/inc/vcl/menu.hxx
index 594e4c5..ba37d34 100644
--- a/main/vcl/inc/vcl/menu.hxx
+++ b/main/vcl/inc/vcl/menu.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -140,14 +140,14 @@ private:
Link aDeactivateHdl; // Deactivate-Handler
Link aHighlightHdl; // Highlight-Handler
Link aSelectHdl; // Highlight-Handler
-
+
VclEventListeners maEventListeners;
VclEventListeners maChildEventListeners;
XubString aTitleText; // PopupMenu-Text
sal_uLong nEventId;
- sal_uInt16 mnHighlightedItemPos; // for native menues: keeps track of the highlighted item
+ sal_uInt16 mnHighlightedItemPos; // for native menus: keeps track of the highlighted item
sal_uInt16 nMenuFlags;
sal_uInt16 nDefaultItem; // Id vom Default-Item
sal_uInt16 nSelectedId;
@@ -189,9 +189,9 @@ protected:
SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; }
SAL_DLLPRIVATE void ImplSetSalMenu( SalMenu *pMenu );
SAL_DLLPRIVATE const XubString& ImplGetHelpText( sal_uInt16 nItemId ) const;
-
+
// returns native check and option menu symbol height;
- // return value is Max( rCheckHeight, rRadioHeight )
+ // return value is Max( rCheckHeight, rRadioHeight )
SAL_DLLPRIVATE long ImplGetNativeCheckAndRadioSize( Window*, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) const;
SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel );
@@ -204,7 +204,7 @@ public:
explicit Menu( sal_Bool bMenuBar );
SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; }
-
+
SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL );
public:
virtual ~Menu();
@@ -304,7 +304,7 @@ public:
void SetHelpCommand( sal_uInt16 nItemId, const XubString& rString );
const XubString& GetHelpCommand( sal_uInt16 nItemId ) const;
-
+
void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId );
rtl::OString GetHelpId( sal_uInt16 nItemId ) const;
@@ -324,18 +324,18 @@ public:
void SetLogo();
sal_Bool HasLogo() const { return pLogo ? sal_True : sal_False; }
MenuLogo GetLogo() const;
-
+
void AddEventListener( const Link& rEventListener );
void RemoveEventListener( const Link& rEventListener );
//void AddChildEventListener( const Link& rEventListener );
//void RemoveChildEventListener( const Link& rEventListener );
-
+
Menu& operator =( const Menu& rMenu );
// Fuer Menu-'Funktionen'
MenuItemList* GetItemList() const { return pItemList; }
- // returns the system's menu handle if native menues are supported
+ // returns the system's menu handle if native menus are supported
// pData must point to a SystemMenuData structure
sal_Bool GetSystemMenuData( SystemMenuData* pData ) const;
@@ -377,14 +377,14 @@ public:
void SetAccessibleDescription( sal_uInt16 nItemId, const XubString& rStr );
XubString GetAccessibleDescription( sal_uInt16 nItemId ) const;
Menu* GetStartedFromMenu(){ return pStartedFrom ;}
-
+
// returns whether the item a position nItemPos is highlighted or not.
bool IsHighlighted( sal_uInt16 nItemPos ) const;
void HighlightItem( sal_uInt16 nItemPos );
void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID
-
-
+
+
void doLazyDelete();
};
@@ -447,7 +447,7 @@ public:
// - by default a menubar is displayable
// - if a menubar is not displayable, its MenuBarWindow will never be shown
// and it will be hidden if it was visible before
- // - note: if a menubar is diplayable, this does not necessarily mean that it is currently visible
+ // - note: if a menubar is displayable, this does not necessarily mean that it is currently visible
void SetDisplayable( sal_Bool bDisplayable );
sal_Bool IsDisplayable() const { return mbDisplayable; }
@@ -533,4 +533,3 @@ inline PopupMenu& PopupMenu::operator =( const PopupMenu& rMenu )
}
#endif // _SV_MENU_HXX
-
diff --git a/main/vcl/os2/source/window/salmenu.cxx b/main/vcl/os2/source/window/salmenu.cxx
index 9c2041b..527b64f 100644
--- a/main/vcl/os2/source/window/salmenu.cxx
+++ b/main/vcl/os2/source/window/salmenu.cxx
@@ -32,7 +32,7 @@
SalMenu* Os2SalInstance::CreateMenu( sal_Bool bMenuBar, Menu* )
{
- return NULL; // no support for native menues
+ return NULL; // no support for native menus
}
void Os2SalInstance::DestroyMenu( SalMenu* pSalMenu )
@@ -43,7 +43,7 @@ void Os2SalInstance::DestroyMenu( SalMenu* pSalMenu )
SalMenuItem* Os2SalInstance::CreateMenuItem( const SalItemParams* pItemData )
{
- return NULL; // no support for native menues
+ return NULL; // no support for native menus
}
void Os2SalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem )
@@ -66,7 +66,7 @@ Os2SalMenu::~Os2SalMenu()
sal_Bool Os2SalMenu::VisibleMenuBar()
{
- return FALSE;
+ return FALSE;
}
void Os2SalMenu::SetFrame( const SalFrame *pFrame )
diff --git a/main/vcl/source/window/decoview.cxx b/main/vcl/source/window/decoview.cxx
index 12bc260..eaced3a 100644
--- a/main/vcl/source/window/decoview.cxx
+++ b/main/vcl/source/window/decoview.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -269,8 +269,8 @@ static void ImplDrawSymbol( OutputDevice* pDev, const Rectangle& rRect,
{
if ( !( nSize & 0x01 ))
{
- // An even rectangle size means we have to use a smaller size for
- // our arrows as we want to use one pixel for the spearhead! Otherwise
+ // An even rectangle size means we have to use a smaller size for
+ // our arrows as we want to use one pixel for the spearhead! Otherwise
// it will be clipped!
nCenterX++;
n2 = ( nMin-1 ) / 2;
@@ -742,12 +742,12 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
pWin = (Window*) pDev;
// UseFlatBorders disables 3D style for all frames except menus
- // menus may use different border colors (eg on XP)
- // normal frames will be drawn using the shadow color
+ // menus may use different border colors (e.g. on XP)
+ // normal frames will be drawn using the shadow color
// whereas window frame borders will use black
sal_Bool bFlatBorders = ( !bMenuStyle && rStyleSettings.GetUseFlatBorders() );
- // no flat borders for standard VCL controls (ie formcontrols that keep their classic look)
+ // no flat borders for standard VCL controls (i.e. formcontrols that keep their classic look)
// will not affect frame windows (like dropdowns)
if( bFlatBorders && pWin && pWin->GetType() == WINDOW_BORDERWINDOW && (pWin != pWin->ImplGetFrameWindow()) )
{
@@ -821,7 +821,7 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
Rectangle aBound, aContent;
Rectangle aNatRgn( rRect );
if( pWin->GetNativeControlRegion(CTRL_FRAME, PART_BORDER,
- aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+ aNatRgn, 0, aControlValue, rtl::OUString(), aBound, aContent) )
{
if( pWin->DrawNativeControl( CTRL_FRAME, PART_BORDER, aContent, CTRL_STATE_ENABLED,
aControlValue, rtl::OUString()) )
@@ -918,7 +918,7 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
rStyleSettings.GetDarkShadowColor() :
rStyleSettings.GetLightBorderColor(),
rStyleSettings.GetDarkShadowColor() );
-
+
}
rRect.Left()++;
@@ -940,7 +940,7 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
}
else
{
- // flat menues have no shadow border
+ // flat menus have no shadow border
if( !bMenuStyle || !rStyleSettings.GetUseFlatMenues() )
pDev->ImplDraw2ColorFrame( rRect,
rStyleSettings.GetLightColor(),
@@ -1262,7 +1262,7 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo
mpOutDev->SetLineColor( Color( COL_BLACK ) );
else
mpOutDev->SetLineColor( rStyleSettings.GetShadowColor() );
-
+
mpOutDev->DrawLine( aStart, aStop );
if ( !(rStyleSettings.GetOptions() & STYLE_OPTION_MONO) )
{
@@ -1281,4 +1281,3 @@ void DecorationView::DrawSeparator( const Point& rStart, const Point& rStop, boo
}
mpOutDev->Pop();
}
-
diff --git a/main/vcl/source/window/floatwin.cxx b/main/vcl/source/window/floatwin.cxx
index 105b78b..c101585 100644
--- a/main/vcl/source/window/floatwin.cxx
+++ b/main/vcl/source/window/floatwin.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -82,7 +82,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
DBG_ASSERT( pParent, "FloatWindow::FloatingWindow(): - pParent == NULL and no AppWindow exists" );
- // no Border, then we dont need a border window
+ // no Border, then we don't need a border window
if ( !nStyle )
{
mpWindowImpl->mbOverlapWin = sal_True;
@@ -98,7 +98,7 @@ void FloatingWindow::ImplInit( Window* pParent, WinBits nStyle )
&& !(nStyle & WB_OWNERDRAWDECORATION) )
{
WinBits nFloatWinStyle = nStyle;
- // #99154# floaters are not closeable by default anymore, eg fullscreen floater
+ // #99154# floaters are not closeable by default anymore, e.g. fullscreen floater
// nFloatWinStyle |= WB_CLOSEABLE;
mpWindowImpl->mbFrame = sal_True;
mpWindowImpl->mbOverlapWin = sal_True;
@@ -250,7 +250,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
Rectangle aScreenRect = pWindow->ImplGetFrameWindow()->GetDesktopRectPixel();
FloatingWindow *pFloatingWindow = dynamic_cast<FloatingWindow*>( pWindow );
- // convert....
+ // convert...
Window* pW = pWindow;
if ( pW->mpWindowImpl->mpRealParent )
pW = pW->mpWindowImpl->mpRealParent;
@@ -260,7 +260,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
sal_Bool bRTL = Application::GetSettings().GetLayoutRTL();
- Rectangle devRect( pW->OutputToAbsoluteScreenPixel( normRect.TopLeft() ),
+ Rectangle devRect( pW->OutputToAbsoluteScreenPixel( normRect.TopLeft() ),
pW->OutputToAbsoluteScreenPixel( normRect.BottomRight() ) );
Rectangle devRectRTL( devRect );
@@ -335,13 +335,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
bBreak = sal_False;
}
if( bBreak )
- {
+ {
e1 = devRect.TopLeft();
e2 = devRect.BottomLeft();
// set non-zero width
e2.X()++;
// don't clip corners
- e1.Y()++;
+ e1.Y()++;
e2.Y()--;
}
break;
@@ -359,13 +359,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
bBreak = sal_False;
}
if( bBreak )
- {
+ {
e1 = devRect.TopRight();
e2 = devRect.BottomRight();
// set non-zero width
e2.X()++;
// don't clip corners
- e1.Y()++;
+ e1.Y()++;
e2.Y()--;
}
break;
@@ -375,13 +375,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
if ( aPos.Y() < aScreenRect.Top() )
bBreak = sal_False;
if( bBreak )
- {
+ {
e1 = devRect.TopLeft();
e2 = devRect.TopRight();
// set non-zero height
e2.Y()++;
// don't clip corners
- e1.X()++;
+ e1.X()++;
e2.X()--;
}
break;
@@ -390,13 +390,13 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
if ( aPos.Y()+aSize.Height() > aScreenRect.Bottom() )
bBreak = sal_False;
if( bBreak )
- {
+ {
e1 = devRect.BottomLeft();
e2 = devRect.BottomRight();
// set non-zero height
e2.Y()++;
// don't clip corners
- e1.X()++;
+ e1.X()++;
e2.X()--;
}
break;
@@ -453,7 +453,7 @@ Point FloatingWindow::ImplCalcPos( Window* pWindow,
Rectangle( e1, e2 );
}
- // caller expects cordinates relative to top-level win
+ // caller expects coordinates relative to top-level win
return pW->OutputToScreenPixel( aPos );
}
@@ -469,7 +469,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
if( pReference->ImplHasMirroredGraphics() )
{
if(!pReference->IsRTLEnabled() )
- // --- RTL --- re-mirror back to get device coordiantes
+ // --- RTL --- re-mirror back to get device coordinates
pReference->ImplReMirror( aAbsolute );
Rectangle aRect( pReference->ScreenToOutputPixel(aAbsolute), Size(1,1) ) ;
@@ -479,7 +479,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
else
aAbsolute = Point( pReference->OutputToAbsoluteScreenPixel(
pReference->ScreenToOutputPixel(rPos) ) );
-
+
do
{
// compute the floating window's size in absolute screen coordinates
@@ -487,7 +487,7 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
// use the border window to have the exact position
Window *pBorderWin = pWin->GetWindow( WINDOW_BORDER );
- Point aPt; // the top-left corner in output coordinates ie (0,0)
+ Point aPt; // the top-left corner in output coordinates i.e. (0,0)
Rectangle devRect( pBorderWin->ImplOutputToUnmirroredAbsoluteScreenPixel( Rectangle( aPt, pBorderWin->GetSizePixel()) ) ) ;
if ( devRect.IsInside( aAbsolute ) )
{
@@ -495,8 +495,8 @@ FloatingWindow* FloatingWindow::ImplFloatHitTest( Window* pReference, const Poin
return pWin;
}
- // test, if mouse is in rectangle, (this is typically the rect of the active
- // toolbox item or similar)
+ // test, if mouse is in rectangle, (this is typically the rect of the active
+ // toolbox item or similar)
// note: maFloatRect is set in FloatingWindow::StartPopupMode() and
// is already in absolute device coordinates
if ( pWin->maFloatRect.IsInside( aAbsolute ) )
@@ -663,7 +663,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
if ( IsRollUp() )
RollDown();
- // remove title
+ // remove title
mnOldTitle = mnTitle;
if ( nFlags & FLOATWIN_POPUPMODE_ALLOWTEAROFF )
SetTitleType( FLOATWIN_TITLE_TEAROFF );
@@ -716,7 +716,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
pSVData->maWinData.mpFirstFloat = this;
if( nFlags & FLOATWIN_POPUPMODE_GRABFOCUS )
{
- // force key input even without focus (useful for menues)
+ // force key input even without focus (useful for menus)
mbGrabFocus = sal_True;
}
Show( sal_True, SHOW_NOACTIVATE );
@@ -784,7 +784,7 @@ void FloatingWindow::ImplEndPopupMode( sal_uInt16 nFlags, sal_uLong nFocusId )
while ( pSVData->maWinData.mpFirstFloat && pSVData->maWinData.mpFirstFloat != this )
pSVData->maWinData.mpFirstFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL );
-
+
// Fenster aus der Liste austragen
pSVData->maWinData.mpFirstFloat = mpNextFloat;
mpNextFloat = NULL;
@@ -868,4 +868,3 @@ void FloatingWindow::RemovePopupModeWindow( Window* pWindow )
if ( mpFirstPopupModeWin == pWindow )
mpFirstPopupModeWin = NULL;
}
-
diff --git a/main/vcl/source/window/menu.cxx b/main/vcl/source/window/menu.cxx
index e8c85e6..9677fbd 100644
--- a/main/vcl/source/window/menu.cxx
+++ b/main/vcl/source/window/menu.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -153,7 +153,7 @@ struct MenuItemData
Menu* pAutoSubMenu; // Pointer auf SubMenu aus Resource
XubString aText; // Menu-Text
XubString aHelpText; // Help-String
- XubString aTipHelpText; // TipHelp-String (eg, expanded filenames)
+ XubString aTipHelpText; // TipHelp-String (e.g. expanded filenames)
XubString aCommandStr; // CommandString
XubString aHelpCommandStr; // Help command string (to reference external help)
rtl::OString aHelpId; // Help-Id
@@ -186,7 +186,7 @@ struct MenuItemData
return bChecked || ( nBits & ( MIB_RADIOCHECK | MIB_CHECKABLE | MIB_AUTOCHECK ) );
}
};
-
+
MenuItemData::~MenuItemData()
{
if( pAutoSubMenu )
@@ -370,7 +370,7 @@ MenuItemData* MenuItemList::SearchItem( xub_Unicode cSelectChar, KeyCode aKeyCod
KeyCode mnKeyCode;
xub_Unicode mnUnicode = pData->aText.GetChar(n+1);
Window* pDefWindow = ImplGetDefaultWindow();
- if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguage(), mnKeyCode )
+ if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( mnUnicode, Application::GetSettings().GetUILanguage(), mnKeyCode )
&& aKeyCode.GetCode() == mnKeyCode.GetCode())
|| (ascii && rI18nHelper.MatchMnemonic( pData->aText, ascii ) ) )
@@ -426,7 +426,7 @@ sal_uInt16 MenuItemList::GetItemCount( KeyCode aKeyCode ) const
// if MapUnicodeToKeyCode fails or is unsupported we try the pure ascii mapping of the keycodes
// so we have working shortcuts when ascii mnemonics are used
Window* pDefWindow = ImplGetDefaultWindow();
- if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText.GetChar(n+1), Application::GetSettings().GetUILanguage(), mnKeyCode )
+ if( (pDefWindow && pDefWindow->ImplGetFrame()->MapUnicodeToKeyCode( pData->aText.GetChar(n+1), Application::GetSettings().GetUILanguage(), mnKeyCode )
&& aKeyCode.GetCode() == mnKeyCode.GetCode())
|| ( ascii && rI18nHelper.MatchMnemonic( pData->aText, ascii ) ) )
nItems++;
@@ -484,7 +484,7 @@ private:
DECL_LINK( ShowHideListener, VclWindowEvent* );
void StateChanged( StateChangedType nType );
- void DataChanged( const DataChangedEvent& rDCEvt );
+ void DataChanged( const DataChangedEvent& rDCEvt );
protected:
Region ImplCalcClipRegion( sal_Bool bIncludeLogo = sal_True ) const;
void ImplInitClipRegion();
@@ -596,7 +596,7 @@ void DecoToolBox::calcMinSize()
if( GetItemCount() == 0 )
{
ResMgr* pResMgr = ImplGetResMgr();
-
+
Bitmap aBitmap;
if( pResMgr )
aBitmap = Bitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
@@ -612,7 +612,7 @@ void DecoToolBox::calcMinSize()
}
}
aTbx.SetOutStyle( TOOLBOX_STYLE_FLAT );
- maMinSize = aTbx.CalcWindowSizePixel();
+ maMinSize = aTbx.CalcWindowSizePixel();
}
Size DecoToolBox::getMinSize()
@@ -638,17 +638,17 @@ void DecoToolBox::SetImages( long nMaxHeight, bool bForce )
BitmapEx aBmpExDst( maImage.GetBitmapEx() );
BitmapEx aBmpExSrc( GetSettings().GetStyleSettings().GetHighContrastMode() ?
maImageHC.GetBitmapEx() : aBmpExDst );
-
+
aEraseColor.SetTransparency( 255 );
aBmpExDst.Erase( aEraseColor );
aBmpExDst.SetSizePixel( Size( lastSize, lastSize ) );
-
+
Rectangle aSrcRect( Point(0,0), maImage.GetSizePixel() );
- Rectangle aDestRect( Point((lastSize - maImage.GetSizePixel().Width())/2,
- (lastSize - maImage.GetSizePixel().Height())/2 ),
+ Rectangle aDestRect( Point((lastSize - maImage.GetSizePixel().Width())/2,
+ (lastSize - maImage.GetSizePixel().Height())/2 ),
maImage.GetSizePixel() );
-
+
aBmpExDst.CopyPixel( aDestRect, aSrcRect, &aBmpExSrc );
SetItemImage( IID_DOCUMENTCLOSE, Image( aBmpExDst ) );
}
@@ -672,7 +672,7 @@ private:
sal_uInt16 m_nId;
Link m_aSelectLink;
Link m_aHighlightLink;
-
+
AddButtonEntry() : m_nId( 0 ) {}
};
@@ -687,7 +687,7 @@ private:
DecoToolBox aCloser;
PushButton aFloatBtn;
PushButton aHideBtn;
-
+
std::map< sal_uInt16, AddButtonEntry > m_aAddButtons;
void HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight );
@@ -697,7 +697,7 @@ private:
void ImplCreatePopup( sal_Bool bPreSelectFirst );
sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMenu = sal_True );
Rectangle ImplGetItemRect( sal_uInt16 nPos );
-
+
void ImplInitStyleSettings();
DECL_LINK( CloserHdl, PushButton* );
@@ -738,7 +738,7 @@ public:
void SetAutoPopup( sal_Bool bAuto ) { mbAutoPopup = bAuto; }
void ImplLayoutChanged();
Size MinCloseButtonSize();
-
+
// add an arbitrary button to the menubar (will appear next to closer)
sal_uInt16 AddMenuBarButton( const Image&, const Link&, const String&, sal_uInt16 nPos );
void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& );
@@ -789,7 +789,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1
{
if( ! pMenu )
return sal_False;
-
+
sal_Bool bDone = sal_False;
sal_uInt16 nId = 0;
@@ -844,7 +844,7 @@ static sal_Bool ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, sal_uInt1
rtl::OString aHelpId( pMenu->GetHelpId( nId ) );
if( ! aHelpId.getLength() )
aHelpId = OOO_HELP_INDEX;
-
+
if ( aCommand.Len() )
pHelp->Start( aCommand, NULL );
else
@@ -898,7 +898,7 @@ Menu::Menu()
}
// this constructor makes sure we're creating the native menu
-// with the correct type (ie, MenuBar vs. PopupMenu)
+// with the correct type (i.e. MenuBar vs. PopupMenu)
Menu::Menu( sal_Bool bMenubar )
{
DBG_CTOR( Menu, NULL );
@@ -909,7 +909,7 @@ Menu::Menu( sal_Bool bMenubar )
Menu::~Menu()
{
DBG_DTOR( Menu, NULL );
-
+
vcl::LazyDeletor<Menu>::Undelete( this );
ImplCallEventListeners( VCLEVENT_OBJECT_DYING, ITEMPOS_INVALID );
@@ -990,7 +990,7 @@ void Menu::ImplLoadRes( const ResId& rResId )
ResMgr* pMgr = rResId.GetResMgr();
if( ! pMgr )
return;
-
+
rResId.SetRT( RSC_MENU );
GetRes( rResId );
@@ -1099,7 +1099,7 @@ void Menu::Deactivate()
if( !aDelData.isDeleted() )
{
bInCallback = sal_False;
-
+
if ( this == pStartMenu )
GetpApp()->HideHelpStatusText();
}
@@ -1279,7 +1279,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos )
ResMgr* pMgr = rResId.GetResMgr();
if( ! pMgr )
return;
-
+
sal_uLong nObjMask;
GetRes( rResId.SetRT( RSC_MENUITEM ) );
@@ -1380,7 +1380,7 @@ void Menu::InsertItem( const ResId& rResId, sal_uInt16 nPos )
void Menu::InsertSeparator( sal_uInt16 nPos )
{
- // do nothing if its a menu bar
+ // do nothing if it's a menu bar
if ( bIsMenuBar )
return;
@@ -1583,7 +1583,7 @@ sal_uInt16 Menu::GetHighlightItem() const
}
-XubString Menu::GetItemAccKeyStrFromPos(sal_uInt16 nPos) const
+XubString Menu::GetItemAccKeyStrFromPos(sal_uInt16 nPos) const
{
MenuItemData* pData = pItemList->GetDataFromPos( nPos );
if (pData)
@@ -1647,7 +1647,7 @@ void Menu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu )
// data exchange
pData->pSubMenu = pMenu;
-
+
// #112023# Make sure pStartedFrom does not point to invalid (old) data
if ( pData->pSubMenu )
pData->pSubMenu->pStartedFrom = 0;
@@ -1932,7 +1932,7 @@ static inline Image ImplRotImage( const Image& rImage, long nAngle10 )
{
Image aRet;
BitmapEx aBmpEx( rImage.GetBitmapEx() );
-
+
aBmpEx.Rotate( nAngle10, COL_WHITE );
return Image( aBmpEx );
@@ -1959,7 +1959,7 @@ static inline Image ImplMirrorImage( const Image& rImage )
{
Image aRet;
BitmapEx aBmpEx( rImage.GetBitmapEx() );
-
+
aBmpEx.Mirror( BMP_MIRROR_HORZ );
return Image( aBmpEx );
@@ -2048,7 +2048,7 @@ const XubString& Menu::GetHelpCommand( sal_uInt16 nItemId ) const
else
return ImplGetSVEmptyStr();
}
-
+
void Menu::SetHelpText( sal_uInt16 nItemId, const XubString& rStr )
{
MenuItemData* pData = pItemList->GetData( nItemId );
@@ -2063,7 +2063,7 @@ const XubString& Menu::ImplGetHelpText( sal_uInt16 nItemId ) const
if ( pData )
{
- if ( !pData->aHelpText.Len() &&
+ if ( !pData->aHelpText.Len() &&
(( pData->aHelpId.getLength() ) || ( pData->aCommandStr.Len() )))
{
Help* pHelp = Application::GetHelp();
@@ -2117,7 +2117,7 @@ void Menu::SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId )
rtl::OString Menu::GetHelpId( sal_uInt16 nItemId ) const
{
rtl::OString aRet;
-
+
MenuItemData* pData = pItemList->GetData( nItemId );
if ( pData )
@@ -2125,9 +2125,9 @@ rtl::OString Menu::GetHelpId( sal_uInt16 nItemId ) const
if ( pData->aHelpId.getLength() )
aRet = pData->aHelpId;
else
- aRet = ::rtl::OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 );
+ aRet = ::rtl::OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 );
}
-
+
return aRet;
}
@@ -2136,7 +2136,7 @@ Menu& Menu::operator=( const Menu& rMenu )
// Aufraeumen
Clear();
- // Items kopieren
+ // copy Items
sal_uInt16 nCount = rMenu.GetItemCount();
for ( sal_uInt16 i = 0; i < nCount; i++ )
ImplCopyItem( this, rMenu, i, MENU_APPEND, 1 );
@@ -2186,7 +2186,7 @@ sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
// check for separator
if( pNextData && pNextData->bVisible && pNextData->eType == MENUITEM_SEPARATOR )
bVisible = sal_False;
-
+
if( bVisible )
{
for( n = nPos; n > 0; n-- )
@@ -2206,7 +2206,7 @@ sal_Bool Menu::ImplIsVisible( sal_uInt16 nPos ) const
// Fuer den Menubar nicht erlaubt, weil ich nicht mitbekomme
// ob dadurch ein Eintrag verschwindet oder wieder da ist.
- if ( bVisible && !bIsMenuBar && ( nMenuFlags & MENU_FLAG_HIDEDISABLEDENTRIES ) &&
+ if ( bVisible && !bIsMenuBar && ( nMenuFlags & MENU_FLAG_HIDEDISABLEDENTRIES ) &&
!( nMenuFlags & MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ) )
{
if( !pData ) // e.g. nPos == ITEMPOS_INVALID
@@ -2244,7 +2244,7 @@ sal_Bool Menu::ImplIsSelectable( sal_uInt16 nPos ) const
// check general visibility first
if ( pData && ( pData->nBits & MIB_NOSELECT ) )
bSelectable = sal_False;
-
+
return bSelectable;
}
@@ -2289,14 +2289,14 @@ void Menu::SelectItem( sal_uInt16 nItemId )
}
void Menu::SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible )
-{
+{
mxAccessible = rxAccessible;
}
long Menu::ImplGetNativeCheckAndRadioSize( Window* pWin, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) const
{
rMaxWidth = rCheckHeight = rRadioHeight = 0;
-
+
if( ! bIsMenuBar )
{
ImplControlValue aVal;
@@ -2521,7 +2521,7 @@ Size Menu::ImplCalcSize( Window* pWin )
long nScreenWidth = aDispRect.GetWidth() >= 800 ? aDispRect.GetWidth() : 800;
if( nMaxWidth > nScreenWidth/2 )
nMaxWidth = nScreenWidth/2;
-
+
sal_uInt16 gfxExtra = (sal_uInt16) Max( nExtra, 7L ); // #107710# increase space between checkmarks/images/text
nCheckPos = (sal_uInt16)nExtra;
if (nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES)
@@ -2553,7 +2553,7 @@ Size Menu::ImplCalcSize( Window* pWin )
{
nTextPos = (sal_uInt16)(2*nExtra);
aSz.Height() = nFontHeight+6;
-
+
// get menubar height from native methods if supported
if( pWindow->IsNativeControlSupported( CTRL_MENUBAR, PART_ENTIRE_CONTROL ) )
{
@@ -2599,10 +2599,10 @@ static void ImplPaintCheckBackground( Window* i_pWindow, const Rectangle& i_rRec
ImplControlValue aControlValue;
Rectangle aCtrlRegion( i_rRect );
ControlState nState = CTRL_STATE_PRESSED | CTRL_STATE_ENABLED;
-
+
aControlValue.setTristateVal( BUTTONVALUE_ON );
-
- bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
+
+ bNativeOk = i_pWindow->DrawNativeControl( CTRL_TOOLBAR, PART_BUTTON,
aCtrlRegion, nState, aControlValue,
rtl::OUString() );
}
@@ -2651,7 +2651,7 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
if ( pLogo )
aTopLeft.X() = pLogo->aBitmap.GetSizePixel().Width();
-
+
int nOuterSpace = 0;
if( !bIsMenuBar )
{
@@ -2684,10 +2684,10 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
sal_uInt16 nTextStyle = 0;
sal_uInt16 nSymbolStyle = 0;
sal_uInt16 nImageStyle = 0;
- // SubMenus ohne Items werden nicht mehr disablte dargestellt,
+ // SubMenus ohne Items werden nicht mehr disabled dargestellt,
// wenn keine Items enthalten sind, da die Anwendung selber
// darauf achten muss. Ansonsten gibt es Faelle, wo beim
- // asyncronen laden die Eintraege disablte dargestellt werden.
+ // asyncronen laden die Eintraege disabled dargestellt werden.
if ( !pData->bEnabled )
{
nTextStyle |= TEXT_DRAW_DISABLE;
@@ -2710,7 +2710,7 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
Size aSz( pData->aSz );
aSz.Width() = aOutSz.Width() - 2*nOuterSpace;
Rectangle aItemRect( aPos, aSz );
- MenupopupValue aVal( nTextPos-GUTTERBORDER, aItemRect );
+ MenupopupValue aVal( nTextPos-GUTTERBORDER, aItemRect );
bNativeOk = pWin->DrawNativeControl( CTRL_MENU_POPUP, PART_MENU_SEPARATOR,
aItemRect,
nState,
@@ -2755,24 +2755,24 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
ControlPart nPart = ((pData->nBits & MIB_RADIOCHECK)
? PART_MENU_ITEM_RADIO_MARK
: PART_MENU_ITEM_CHECK_MARK);
-
+
ControlState nState = 0;
-
+
if ( pData->bChecked )
nState |= CTRL_STATE_PRESSED;
-
+
if ( pData->bEnabled )
nState |= CTRL_STATE_ENABLED;
-
+
if ( bHighlighted )
nState |= CTRL_STATE_SELECTED;
-
+
long nCtrlHeight = (pData->nBits & MIB_RADIOCHECK) ? nCheckHeight : nRadioHeight;
aTmpPos.X() = aOuterCheckRect.Left() + (aOuterCheckRect.GetWidth() - nCtrlHeight)/2;
aTmpPos.Y() = aOuterCheckRect.Top() + (aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
-
+
Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, nCtrlHeight ) );
- MenupopupValue aVal( nTextPos-GUTTERBORDER, Rectangle( aPos, pData->aSz ) );
+ MenupopupValue aVal( nTextPos-GUTTERBORDER, Rectangle( aPos, pData->aSz ) );
pWin->DrawNativeControl( CTRL_MENU_POPUP, nPart,
aCheckRect,
nState,
@@ -2782,7 +2782,7 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, long nStartY, MenuItemDa
else if ( pData->bChecked ) // by default do nothing for unchecked items
{
ImplPaintCheckBackground( pWin, aOuterCheckRect, pThisItemOnly && bHighlighted );
-
+
SymbolType eSymbol;
Size aSymbolSize;
if ( pData->nBits & MIB_RADIOCHECK )
@@ -3285,7 +3285,7 @@ sal_Bool Menu::GetSystemMenuData( SystemMenuData* pData ) const
bool Menu::IsHighlighted( sal_uInt16 nItemPos ) const
{
bool bRet = false;
-
+
if( pWindow )
{
if( bIsMenuBar )
@@ -3293,7 +3293,7 @@ bool Menu::IsHighlighted( sal_uInt16 nItemPos ) const
else
bRet = ( nItemPos == static_cast< MenuFloatingWindow * > (pWindow)->GetHighlightedItem() );
}
-
+
return bRet;
}
@@ -3401,8 +3401,8 @@ Window* MenuBar::ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu )
long nHeight = pMenu->ImplCalcSize( pWindow ).Height();
// depending on the native implementation or the displayable flag
- // the menubar windows is suppressed (ie, height=0)
- if( !((MenuBar*) pMenu)->IsDisplayable() ||
+ // the menubar windows is suppressed (i.e. height=0)
+ if( !((MenuBar*) pMenu)->IsDisplayable() ||
( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() ) )
nHeight = 0;
@@ -3426,7 +3426,7 @@ sal_Bool MenuBar::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMen
sal_Bool bDone = sal_False;
// No keyboard processing when system handles the menu or our menubar is invisible
- if( !IsDisplayable() ||
+ if( !IsDisplayable() ||
( ImplGetSalMenu() && ImplGetSalMenu()->VisibleMenuBar() ) )
return bDone;
@@ -3471,11 +3471,11 @@ sal_Bool MenuBar::HandleMenuActivateEvent( Menu *pMenu ) const
ImplMenuDelData aDelData( this );
pMenu->pStartedFrom = (Menu*)this;
- pMenu->bInCallback = sal_True;
+ pMenu->bInCallback = sal_True;
pMenu->Activate();
-
+
if( !aDelData.isDeleted() )
- pMenu->bInCallback = sal_False;
+ pMenu->bInCallback = sal_False;
}
return sal_True;
}
@@ -3487,10 +3487,10 @@ sal_Bool MenuBar::HandleMenuDeActivateEvent( Menu *pMenu ) const
ImplMenuDelData aDelData( this );
pMenu->pStartedFrom = (Menu*)this;
- pMenu->bInCallback = sal_True;
+ pMenu->bInCallback = sal_True;
pMenu->Deactivate();
if( !aDelData.isDeleted() )
- pMenu->bInCallback = sal_False;
+ pMenu->bInCallback = sal_False;
}
return sal_True;
}
@@ -3563,7 +3563,7 @@ void MenuBar::RemoveMenuBarButton( sal_uInt16 nId )
sal_Bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 i_nButtonId ) const
{
- return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId );
+ return static_cast<MenuBarWindow*>(pWindow)->HandleMenuButtonEvent( i_nButtonId );
}
// -----------------------------------------------------------------------
@@ -3669,7 +3669,7 @@ sal_uInt16 PopupMenu::Execute( Window* pExecWindow, const Rectangle& rRect, sal_
nPopupModeFlags = FLOATWIN_POPUPMODE_DOWN;
if (nFlags & POPUPMENU_NOMOUSEUPCLOSE ) // allow popup menus to stay open on mouse button up
- nPopupModeFlags |= FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE; // useful if the menu was opened on mousebutton down (eg toolbox configuration)
+ nPopupModeFlags |= FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE; // useful if the menu was opened on mousebutton down (e.g. toolbox configuration)
return ImplExecute( pExecWindow, rRect, nPopupModeFlags, 0, sal_False );
}
@@ -3744,7 +3744,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
nMenuFlags &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
}
else
- // #102790# context menues shall never show disabled entries
+ // #102790# context menus shall never show disabled entries
nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES;
@@ -3853,7 +3853,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
if ( bRealExecute )
{
pWin->ImplAddDel( &aDelData );
-
+
ImplDelData aModalWinDel;
pW->ImplAddDel( &aModalWinDel );
pW->ImplIncModalCount();
@@ -3870,7 +3870,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
return 0;
// Focus wieder herstellen (kann schon im Select wieder
- // hergestellt wurden sein
+ // hergestellt worden sein
nFocusId = pWin->GetFocusId();
if ( nFocusId )
{
@@ -4025,7 +4025,7 @@ MenuFloatingWindow::MenuFloatingWindow( Menu* pMen, Window* pParent, WinBits nSt
aSubmenuCloseTimer.SetTimeout( GetSettings().GetMouseSettings().GetMenuDelay() );
aSubmenuCloseTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, SubmenuClose ) );
aScrollTimer.SetTimeoutHdl( LINK( this, MenuFloatingWindow, AutoScroll ) );
-
+
AddEventListener( LINK( this, MenuFloatingWindow, ShowHideListener ) );
}
@@ -4056,12 +4056,12 @@ void MenuFloatingWindow::doShutdown()
pPWin->HighlightItem( i, sal_False );
}
}
-
+
// free the reference to the accessible component
SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >() );
-
+
aHighlightChangedTimer.Stop();
-
+
// #95056# invalidate screen area covered by system window
// so this can be taken into account if the commandhandler performs a scroll operation
if( GetParent() )
@@ -4129,7 +4129,7 @@ void MenuFloatingWindow::ImplHighlightItem( const MouseEvent& rMEvt, sal_Bool bM
{
if( ! pMenu )
return;
-
+
long nY = nScrollerHeight;
long nMouseY = rMEvt.GetPosPixel().Y();
Size aOutSz = GetOutputSizePixel();
@@ -4262,7 +4262,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer )
{
if( ! pMenu )
return 0;
-
+
MenuItemData* pItemData = pMenu->pItemList->GetDataFromPos( nHighlightedItem );
if ( pItemData )
{
@@ -4314,7 +4314,7 @@ IMPL_LINK( MenuFloatingWindow, HighlightChanged, Timer*, pTimer )
sal_uInt16 nRet = pActivePopup->ImplExecute( this, Rectangle( aItemTopLeft, aItemBottomRight ), FLOATWIN_POPUPMODE_RIGHT, pMenu, pTimer ? sal_False : sal_True );
SetPopupModeFlags( nOldFlags );
- // nRet != 0, wenn es waerend Activate() abgeschossen wurde...
+ // nRet != 0, wenn es waehrend Activate() abgeschossen wurde...
if ( !nRet && ( pActivePopup == pTest ) && pActivePopup->ImplGetWindow() )
pActivePopup->ImplGetFloatingWindow()->AddPopupModeWindow( this );
}
@@ -4338,7 +4338,7 @@ IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent*, pEvent )
{
if( ! pMenu )
return 0;
-
+
if( pEvent->GetId() == VCLEVENT_WINDOW_SHOW )
pMenu->ImplCallEventListeners( VCLEVENT_MENU_SHOW, ITEMPOS_INVALID );
else if( pEvent->GetId() == VCLEVENT_WINDOW_HIDE )
@@ -4441,7 +4441,7 @@ void MenuFloatingWindow::EndExecute()
ImplGetSVData()->maWinData.mbNoDeactivate = sal_False;
}
}
-
+
// Wenn von woanders gestartet, dann ab dort aufraumen:
MenuFloatingWindow* pCleanUpFrom = this;
MenuFloatingWindow* pWin = this;
@@ -4488,7 +4488,7 @@ void MenuFloatingWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
// TH macht ein ToTop auf dieses Fenster, aber das aktive Popup
// soll oben bleiben...
- // due to focus chage this would close all menues -> don't do it (#94123)
+ // due to focus change this would close all menus -> don't do it (#94123)
//if ( pActivePopup && pActivePopup->ImplGetWindow() && !pActivePopup->ImplGetFloatingWindow()->pActivePopup )
// pActivePopup->ImplGetFloatingWindow()->ToTop( TOTOP_NOGRABFOCUS );
@@ -4565,7 +4565,7 @@ void MenuFloatingWindow::ImplScroll( sal_Bool bUp )
{
KillActivePopup();
Update();
-
+
if( ! pMenu )
return;
@@ -4731,7 +4731,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
{
if( ! pMenu )
return;
-
+
Size aSz = GetOutputSizePixel();
long nStartY = ImplGetStartY();
long nY = nScrollerHeight+nStartY;
@@ -4742,7 +4742,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
int nOuterSpace = ImplGetSVData()->maNWFData.mnMenuFormatExtraBorder;
nY += nOuterSpace;
-
+
sal_uInt16 nCount = (sal_uInt16)pMenu->pItemList->Count();
for ( sal_uInt16 n = 0; n < nCount; n++ )
{
@@ -4762,7 +4762,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
long nFontHeight = GetTextHeight();
aItemRect.Right() -= nFontHeight + nFontHeight/4;
}
-
+
if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) )
{
Size aPxSize( GetOutputSizePixel() );
@@ -4808,7 +4808,7 @@ void MenuFloatingWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
}
else
SetFillColor( GetSettings().GetStyleSettings().GetMenuColor() );
-
+
DrawRect( aItemRect );
}
pMenu->ImplPaint( this, nScrollerHeight, nStartY, pData, bHighlight );
@@ -4826,7 +4826,7 @@ Rectangle MenuFloatingWindow::ImplGetItemRect( sal_uInt16 nPos )
{
if( ! pMenu )
return Rectangle();
-
+
Rectangle aRect;
Size aSz = GetOutputSizePixel();
long nStartY = ImplGetStartY();
@@ -4864,7 +4864,7 @@ void MenuFloatingWindow::ImplCursorUpDown( sal_Bool bUp, sal_Bool bHomeEnd )
{
if( ! pMenu )
return;
-
+
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
sal_uInt16 n = nHighlightedItem;
@@ -5112,7 +5112,7 @@ void MenuFloatingWindow::Paint( const Rectangle& )
{
if( ! pMenu )
return;
-
+
if( IsNativeControlSupported( CTRL_MENU_POPUP, PART_ENTIRE_CONTROL ) )
{
SetClipRegion();
@@ -5142,7 +5142,7 @@ void MenuFloatingWindow::ImplDrawScroller( sal_Bool bUp )
{
if( ! pMenu )
return;
-
+
SetClipRegion();
Size aOutSz = GetOutputSizePixel();
@@ -5253,30 +5253,30 @@ MenuBarWindow::MenuBarWindow( Window* pParent ) :
{
BitmapEx aBitmap( ResId( SV_RESID_BITMAP_CLOSEDOC, *pResMgr ) );
BitmapEx aBitmapHC( ResId( SV_RESID_BITMAP_CLOSEDOCHC, *pResMgr ) );
-
+
aCloser.maImage = Image( aBitmap );
aCloser.maImageHC = Image( aBitmapHC );
-
+
aCloser.SetOutStyle( TOOLBOX_STYLE_FLAT );
aCloser.SetBackground();
aCloser.SetPaintTransparent( sal_True );
aCloser.SetParentClipMode( PARENTCLIPMODE_NOCLIP );
-
+
aCloser.InsertItem( IID_DOCUMENTCLOSE,
GetSettings().GetStyleSettings().GetHighContrastMode() ? aCloser.maImageHC : aCloser.maImage, 0 );
aCloser.SetSelectHdl( LINK( this, MenuBarWindow, CloserHdl ) );
aCloser.AddEventListener( LINK( this, MenuBarWindow, ToolboxEventHdl ) );
aCloser.SetQuickHelpText( IID_DOCUMENTCLOSE, XubString( ResId( SV_HELPTEXT_CLOSEDOCUMENT, *pResMgr ) ) );
-
+
aFloatBtn.SetClickHdl( LINK( this, MenuBarWindow, FloatHdl ) );
aFloatBtn.SetSymbol( SYMBOL_FLOAT );
aFloatBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_RESTORE, *pResMgr ) ) );
-
+
aHideBtn.SetClickHdl( LINK( this, MenuBarWindow, HideHdl ) );
aHideBtn.SetSymbol( SYMBOL_HIDE );
aHideBtn.SetQuickHelpText( XubString( ResId( SV_HELPTEXT_MINIMIZE, *pResMgr ) ) );
}
-
+
ImplInitStyleSettings();
AddEventListener( LINK( this, MenuBarWindow, ShowHideListener ) );
@@ -5331,7 +5331,7 @@ IMPL_LINK( MenuBarWindow, CloserHdl, PushButton*, EMPTYARG )
{
if( ! pMenu )
return 0;
-
+
if( aCloser.GetCurItemId() == IID_DOCUMENTCLOSE )
{
// #i106052# call close hdl asynchronously to ease handler implementation
@@ -5358,7 +5358,7 @@ IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent*, pEvent )
{
if( ! pMenu )
return 0;
-
+
MenuBar::MenuBarButtonCallbackArg aArg;
aArg.nId = 0xffff;
aArg.bHighlight = (pEvent->GetId() == VCLEVENT_TOOLBOX_HIGHLIGHT);
@@ -5382,7 +5382,7 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent*, pEvent )
{
if( ! pMenu )
return 0;
-
+
if( pEvent->GetId() == VCLEVENT_WINDOW_SHOW )
pMenu->ImplCallEventListeners( VCLEVENT_MENU_SHOW, ITEMPOS_INVALID );
else if( pEvent->GetId() == VCLEVENT_WINDOW_HIDE )
@@ -5520,7 +5520,7 @@ void MenuBarWindow::MouseMove( const MouseEvent& rMEvt )
}
sal_uInt16 nEntry = ImplFindEntry( rMEvt.GetPosPixel() );
- if ( ( nEntry != ITEMPOS_INVALID )
+ if ( ( nEntry != ITEMPOS_INVALID )
#ifdef OS2
&& ( ImplHilite(rMEvt) )
#endif
@@ -5532,7 +5532,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa
{
if( ! pMenu )
return;
-
+
// #57934# ggf. das aktive Popup sofort schliessen, damit TH's Hintergrundsicherung funktioniert.
MenuItemData* pNextData = pMenu->pItemList->GetDataFromPos( n );
if ( pActivePopup && pActivePopup->ImplGetWindow() && ( !pNextData || ( pActivePopup != pNextData->pSubMenu ) ) )
@@ -5559,7 +5559,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, sal_Bool bSelectEntry, sa
nSaveFocusId = Window::SaveFocus(); // only save focus when initially activated
}
else {
- ; // do nothing: we 're activated again from taskpanelist, focus was already saved
+ ; // do nothing: we're activated again from taskpanelist, focus was already saved
}
}
else
@@ -5616,7 +5616,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
{
if( ! pMenu )
return;
-
+
long nX = 0;
sal_uLong nCount = pMenu->pItemList->Count();
for ( sal_uLong n = 0; n < nCount; n++ )
@@ -5647,7 +5647,7 @@ void MenuBarWindow::HighlightItem( sal_uInt16 nPos, sal_Bool bHighlight )
aControlValue,
OUString() );
ImplAddNWFSeparator( this, aControlValue );
-
+
// draw selected item
DrawNativeControl( CTRL_MENUBAR, PART_MENU_ITEM,
aRect,
@@ -5707,7 +5707,7 @@ Rectangle MenuBarWindow::ImplGetItemRect( sal_uInt16 nPos )
aRect = Rectangle( Point( nX, 1 ), Size( pData->aSz.Width(), GetOutputSizePixel().Height()-2 ) );
break;
}
-
+
nX += pData->aSz.Width();
}
}
@@ -5724,7 +5724,7 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF
{
if( ! pMenu )
return sal_False;
-
+
if ( pMenu->bInCallback )
return sal_True; // schlucken
@@ -5770,10 +5770,10 @@ sal_Bool MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bF
else
n = pMenu->GetItemCount()-1;
}
-
+
// handling gtk like (aka mbOpenMenuOnF10)
// do not highlight an item when opening a sub menu
- // unless there already was a higlighted sub menu item
+ // unless there already was a highlighted sub menu item
bool bWasHighlight = false;
if( pActivePopup )
{
@@ -5894,7 +5894,7 @@ void MenuBarWindow::Paint( const Rectangle& )
{
if( ! pMenu )
return;
-
+
// no VCL paint if native menus
if( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() )
{
@@ -5963,7 +5963,7 @@ void MenuBarWindow::Resize()
aFloatBtn.SetSymbol( SYMBOL_FLOAT );
aHideBtn.SetSymbol( SYMBOL_HIDE );
- //aCloser.SetSymbol( SYMBOL_CLOSE ); //is a toolbox now
+ //aCloser.SetSymbol( SYMBOL_CLOSE ); // is a toolbox now
Invalidate();
}
@@ -6023,8 +6023,8 @@ void MenuBarWindow::ImplLayoutChanged()
long nHeight = pMenu->ImplCalcSize( this ).Height();
// depending on the native implementation or the displayable flag
- // the menubar windows is suppressed (ie, height=0)
- if( !((MenuBar*) pMenu)->IsDisplayable() ||
+ // the menubar windows is suppressed (i.e. height=0)
+ if( !((MenuBar*) pMenu)->IsDisplayable() ||
( pMenu->ImplGetSalMenu() && pMenu->ImplGetSalMenu()->VisibleMenuBar() ) )
nHeight = 0;
@@ -6100,7 +6100,7 @@ sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link& i
std::map< sal_uInt16, AddButtonEntry >::const_iterator it;
if( i_nPos > m_aAddButtons.size() )
i_nPos = static_cast<sal_uInt16>(m_aAddButtons.size());
- do
+ do
{
nId++;
it = m_aAddButtons.find( nId );
@@ -6115,10 +6115,10 @@ sal_uInt16 MenuBarWindow::AddMenuBarButton( const Image& i_rImage, const Link& i
aFloatBtn.IsVisible(),
aHideBtn.IsVisible() );
ImplLayoutChanged();
-
+
if( pMenu->mpSalMenu )
pMenu->mpSalMenu->AddMenuBarButton( SalMenuButtonItem( nId, i_rImage, i_rToolTip ) );
-
+
return nId;
}
@@ -6139,11 +6139,11 @@ Rectangle MenuBarWindow::GetMenuBarButtonRectPixel( sal_uInt16 nId )
aRect = pMenu->mpSalMenu->GetMenuBarButtonRectPixel( nId, ImplGetWindowImpl()->mpFrame );
if( aRect == Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) )
{
- // system menu button is somehwere but location cannot be determined
+ // system menu button is somewhere but location cannot be determined
return Rectangle();
}
}
-
+
if( aRect.IsEmpty() )
{
aRect = aCloser.GetItemRect( nId );
diff --git a/main/vcl/source/window/window.cxx b/main/vcl/source/window/window.cxx
index b5c50b0..737db1e 100644
--- a/main/vcl/source/window/window.cxx
+++ b/main/vcl/source/window/window.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -152,7 +152,7 @@ WindowImpl::WindowImpl( WindowType nType )
maZoom = Fraction( 1, 1 );
maWinRegion = Region(true);
maWinClipRegion = Region(true);
- mpWinData = NULL; // Extra Window Data, that we dont need for all windows
+ mpWinData = NULL; // Extra Window Data, that we don't need for all windows
mpOverlapData = NULL; // Overlap Data
mpFrameData = NULL; // Frame Data
mpFrame = NULL; // Pointer to frame window
@@ -161,8 +161,8 @@ WindowImpl::WindowImpl( WindowType nType )
mpOverlapWindow = NULL; // first overlap parent
mpBorderWindow = NULL; // Border-Window
mpClientWindow = NULL; // Client-Window of a FrameWindow
- mpParent = NULL; // parent (inkl. BorderWindow)
- mpRealParent = NULL; // real parent (exkl. BorderWindow)
+ mpParent = NULL; // parent (incl. BorderWindow)
+ mpRealParent = NULL; // real parent (excl. BorderWindow)
mpFirstChild = NULL; // first child window
mpLastChild = NULL; // last child window
mpFirstOverlap = NULL; // first overlap window (only set in overlap windows)
@@ -176,7 +176,7 @@ WindowImpl::WindowImpl( WindowType nType )
mpUserData = NULL; // user data
mpExtImpl = NULL; // extended implementation data
mpCursor = NULL; // cursor
- mpControlFont = NULL; // font propertie
+ mpControlFont = NULL; // font property
mpVCLXWindow = NULL;
mpAccessibleInfos = NULL;
maControlForeground = Color( COL_TRANSPARENT ); // foreground color not set
@@ -224,8 +224,8 @@ WindowImpl::WindowImpl( WindowType nType )
mbNoParentUpdate = sal_False; // sal_True: SetParentUpdateMode( sal_False ) called
mbActive = sal_False; // sal_True: Window Active
mbParentActive = sal_False; // sal_True: OverlapActive from Parent
- mbReallyVisible = sal_False; // sal_True: this and all parents to an overlaped window are visible
- mbReallyShown = sal_False; // sal_True: this and all parents to an overlaped window are shown
+ mbReallyVisible = sal_False; // sal_True: this and all parents to an overlapped window are visible
+ mbReallyShown = sal_False; // sal_True: this and all parents to an overlapped window are shown
mbInInitShow = sal_False; // sal_True: we are in InitShow
mbChildNotify = sal_False; // sal_True: ChildNotify
mbChildPtrOverwrite = sal_False; // sal_True: PointerStyle overwrites Child-Pointer
@@ -398,7 +398,7 @@ bool Window::ImplCheckUIFont( const Font& rFont )
static const StandardButtonType aTestButtons[] =
{
BUTTON_OK, BUTTON_CANCEL, BUTTON_CLOSE, BUTTON_ABORT,
- BUTTON_YES, BUTTON_NO, BUTTON_MORE, BUTTON_IGNORE,
+ BUTTON_YES, BUTTON_NO, BUTTON_MORE, BUTTON_IGNORE,
BUTTON_RETRY, BUTTON_HELP
};
@@ -524,7 +524,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
// to avoid UI scaling due to large fonts
// - but allow bigger fonts on bigger screens (i16682, i21238)
// dialogs were designed to fit 800x600 with an 8pt font, so scale accordingly
- int maxFontheight = 9; // #107886#: 9 is default for some asian systems, so always allow if requested
+ int maxFontheight = 9; // #107886#: 9 is default for some Asian systems, so always allow if requested
if( GetDesktopRectPixel().getHeight() > 600 )
maxFontheight = (int) ((( 8.0 * (double) GetDesktopRectPixel().getHeight()) / 600.0) + 1.5);
@@ -533,8 +533,8 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
if( defFontheight > maxFontheight )
defFontheight = maxFontheight;
- // if the UI is korean, chinese or another locale
- // where the system font size is kown to be often too small to
+ // if the UI is Korean, Chinese or another locale
+ // where the system font size is known to be often too small to
// generate readable fonts enforce a minimum font size of 9 points
bool bBrokenLangFontHeight = false;
static const LanguageType eBrokenSystemFontSizeLanguages[] =
@@ -543,7 +543,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
};
static std::set< LanguageType > aBrokenSystemFontSizeLanguagesSet(
eBrokenSystemFontSizeLanguages,
- eBrokenSystemFontSizeLanguages +
+ eBrokenSystemFontSizeLanguages +
(sizeof(eBrokenSystemFontSizeLanguages)/sizeof(eBrokenSystemFontSizeLanguages[0]))
);
LanguageType aLang = Application::GetSettings().GetUILanguage();
@@ -648,7 +648,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl
}
}
}
-
+
static const char* pEnvHC = getenv( "SAL_FORCE_HC" );
if( pEnvHC && *pEnvHC )
{
@@ -739,7 +739,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste
ImplSVData* pSVData = ImplGetSVData();
Window* pRealParent = pParent;
-
+
// 3D-Look vererben
if ( !mpWindowImpl->mbOverlapWin && pParent && (pParent->GetStyle() & WB_3DLOOK) )
nStyle |= WB_3DLOOK;
@@ -1150,7 +1150,7 @@ void Window::ImplCallResize()
// #88419# Most classes don't call the base class in Resize() and Move(),
// => Call ImpleResize/Move instead of Resize/Move directly...
ImplCallEventListeners( VCLEVENT_WINDOW_RESIZE );
-
+
ImplExtResize();
}
@@ -1184,7 +1184,7 @@ void Window::ImplCallMove()
}
// the client window and and all its subclients have the same position as the borderframe
// this is important for floating toolbars where the borderwindow is a floating window
- // which has another borderwindow (ie the system floating window)
+ // which has another borderwindow (i.e. the system floating window)
Window *pClientWin = mpWindowImpl->mpClientWindow;
while( pClientWin )
{
@@ -1203,7 +1203,7 @@ void Window::ImplCallMove()
static rtl::OString ImplAutoHelpID( ResMgr* pResMgr )
{
rtl::OString aRet;
-
+
if( pResMgr && Application::IsAutoHelpIdEnabled() )
aRet = pResMgr->GetAutoHelpId();
@@ -1238,8 +1238,8 @@ void Window::ImplLoadRes( const ResId& rResId )
// ResourceStyle
sal_uLong nRSStyle = ReadLongRes();
// WinBits
- ReadLongRes();
-
+ ReadLongRes();
+
if( nObjMask & WINDOW_HELPID )
aHelpId = ReadByteStringRes();
@@ -1523,7 +1523,7 @@ PointerStyle Window::ImplGetMousePointer() const
const Window* pWindow = this;
do
{
- // Wenn Pointer nicht sichtbar, dann wird suche abgebrochen, da
+ // Wenn Pointer nicht sichtbar, dann wird Suche abgebrochen, da
// dieser Status nicht ueberschrieben werden darf
if ( pWindow->mpWindowImpl->mbNoPtrVisible )
return POINTER_NULL;
@@ -1820,8 +1820,8 @@ sal_Bool Window::ImplSysObjClip( const Region* pOldRegion )
for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); aRectIter++)
{
mpWindowImpl->mpSysObj->UnionClipRegion(
- aRectIter->Left(),
- aRectIter->Top(),
+ aRectIter->Left(),
+ aRectIter->Top(),
aRectIter->GetWidth(), // orig nWidth was ((R - L) + 1), same as GetWidth does
aRectIter->GetHeight()); // same for height
}
@@ -2373,7 +2373,7 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
// call PrePaint. PrePaint may add to the invalidate region as well as
// other parameters used below.
PrePaint();
-
+
mpWindowImpl->mbPaintFrame = sal_False;
if ( nPaintFlags & IMPL_PAINT_PAINTALLCHILDS )
@@ -2459,12 +2459,12 @@ void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags )
Erase();
}
- // #98943# trigger drawing of toolbox selection after all childern are painted
+ // #98943# trigger drawing of toolbox selection after all children are painted
if( mpWindowImpl->mbDrawSelectionBackground )
aSelectionRect = aPaintRect;
// Paint can throw exceptions; to not have a situation where
- // mpWindowImpl->mbInPaint keeps to be on true (and other
+ // mpWindowImpl->mbInPaint keeps to be on true (and other
// settings, too) better catch here to avoid to go completely out of
// this method without executing the after-paint stuff
try
@@ -3332,7 +3332,7 @@ void Window::ImplPosSizeWindow( long nX, long nY,
nX = mpWindowImpl->mpParent->mnOutWidth - mnOutWidth - nX;
}
}
-
+
// check maPos as well, as it could have been changed for client windows (ImplCallMove())
if ( mpWindowImpl->mnAbsScreenX != aPtDev.X() || nX != mpWindowImpl->mnX || nOrgX != mpWindowImpl->maPos.X() )
{
@@ -4037,7 +4037,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
return;
// we only need to set the focus if it is not already set
- // note: if some other frame is waiting for an asynchrounous focus event
+ // note: if some other frame is waiting for an asynchronous focus event
// we also have to post an asynchronous focus event for this frame
// which is done using ToTop
ImplSVData* pSVData = ImplGetSVData();
@@ -4087,7 +4087,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
if( !bHasFocus )
{
- // menue windows never get the system focus
+ // menu windows never get the system focus
// the application will keep the focus
if( bMustNotGrabFocus )
return;
@@ -4108,7 +4108,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
if ( pOldFocusWindow )
{
- // Cursor hiden
+ // hide Cursor
if ( pOldFocusWindow->mpWindowImpl->mpCursor )
pOldFocusWindow->mpWindowImpl->mpCursor->ImplHide( true );
}
@@ -4268,7 +4268,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags )
mpWindowImpl->mnGetFocusFlags = nFlags;
// if we're changing focus due to closing a popup floating window
// notify the new focus window so it can restore the inner focus
- // eg, toolboxes can select their recent active item
+ // e.g. toolboxes can select their recent active item
if( pOldFocusWindow &&
! aOldFocusDel.IsDelete() &&
( pOldFocusWindow->GetDialogControlFlags() & WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ) )
@@ -4318,7 +4318,7 @@ void Window::ImplNewInputContext()
if ( !aSize.Height() )
{
// Nur dann Defaultgroesse setzen, wenn Fonthoehe auch in logischen
- // Koordinaaten 0 ist
+ // Koordinaten 0 ist
if ( rFont.GetSize().Height() )
aSize.Height() = 1;
else
@@ -4402,7 +4402,7 @@ namespace
Window::~Window()
{
ImplFreeExtWindowImpl();
-
+
vcl::LazyDeletor<Window>::Undelete( this );
DBG_DTOR( Window, ImplDbgCheckWindow );
@@ -4413,7 +4413,7 @@ Window::~Window()
Application::RemoveMouseAndKeyEvents( this );
// Dispose of the canvas implementation (which, currently, has an
- // own wrapper window as a child to this one.
+ // own wrapper window as a child to this one)
uno::Reference< rendering::XCanvas > xCanvas( mpWindowImpl->mxCanvas );
if( xCanvas.is() )
{
@@ -5122,7 +5122,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt )
// #82968# notify event listeners for mouse and key events separately and
// not in PreNotify ( as for focus listeners )
- // this allows for procesing those events internally first and pass it to
+ // this allows for processing those events internally first and pass it to
// the toolkit later
ImplDelData aDelData;
@@ -6121,9 +6121,9 @@ void Window::SetWindowRegionPixel( const Region& rRegion )
for(RectangleVector::const_iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); aRectIter++)
{
- mpWindowImpl->mpFrame->UnionClipRegion(
- aRectIter->Left(),
- aRectIter->Top(),
+ mpWindowImpl->mpFrame->UnionClipRegion(
+ aRectIter->Left(),
+ aRectIter->Top(),
aRectIter->GetWidth(), // orig nWidth was ((R - L) + 1), same as GetWidth does
aRectIter->GetHeight()); // same for height
}
@@ -6374,7 +6374,7 @@ void Window::SetParent( Window* pNewParent )
pOldOverlapWindow = NULL;
}
- // Fenster in der Hirachie umsetzen
+ // Fenster in der Hierachie umsetzen
sal_Bool bFocusOverlapWin = HasChildPathFocus( sal_True );
sal_Bool bFocusWin = HasChildPathFocus();
sal_Bool bNewFrame = pNewParent->mpWindowImpl->mpFrameWindow != mpWindowImpl->mpFrameWindow;
@@ -6406,7 +6406,7 @@ void Window::SetParent( Window* pNewParent )
// Wenn sich das Overlap-Window geaendert hat, dann muss getestet werden,
// ob auch OverlapWindow die das Child-Fenster als Parent gehabt haben
- // in der Window-Hirachie umgesetzt werden muessen
+ // in der Window-Hierachie umgesetzt werden muessen
if ( ImplIsOverlapWindow() )
{
if ( bNewFrame )
@@ -6582,8 +6582,8 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
else
{
// inherit native widget flag for form controls
- // required here, because frames never show up in the child hierarchy - which should be fixed....
- // eg, the drop down of a combobox which is a system floating window
+ // required here, because frames never show up in the child hierarchy - which should be fixed...
+ // e.g. the drop down of a combobox which is a system floating window
if( mpWindowImpl->mbFrame && GetParent() && GetParent()->IsCompoundControl() &&
GetParent()->IsNativeWidgetEnabled() != IsNativeWidgetEnabled() )
EnableNativeWidget( GetParent()->IsNativeWidgetEnabled() );
@@ -6700,7 +6700,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
// #107575#, if a floating windows is shown that grabs the focus, we have to notify the toolkit about it
// ImplGrabFocus() is not called in this case
// Because this might lead to problems the task will be shifted to 6.y
- // Note: top-level context menues are registered at the access bridge after being shown,
+ // Note: top-level context menus are registered at the access bridge after being shown,
// so this will probably not help here....
/*
if( mpWindowImpl->mbFloatWin && ((FloatingWindow*) this )->GrabsFocus() )
@@ -6758,7 +6758,7 @@ void Window::Enable( bool bEnable, bool bChild )
if ( !bEnable )
{
- // Wenn ein Fenster disablte wird, wird automatisch der Tracking-Modus
+ // Wenn ein Fenster disabled wird, wird automatisch der Tracking-Modus
// beendet oder der Capture geklaut
if ( IsTracking() )
EndTracking( ENDTRACK_CANCEL );
@@ -6854,7 +6854,7 @@ void Window::EnableInput( sal_Bool bEnable, sal_Bool bChild )
if ( (! bEnable && mpWindowImpl->meAlwaysInputMode != AlwaysInputEnabled) ||
( bEnable && mpWindowImpl->meAlwaysInputMode != AlwaysInputDisabled) )
{
- // Wenn ein Fenster disablte wird, wird automatisch der
+ // Wenn ein Fenster disabled wird, wird automatisch der
// Tracking-Modus beendet oder der Capture geklaut
if ( !bEnable )
{
@@ -7212,7 +7212,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
// einmal ausgegeben wurde.
if ( !bInitWinClipRegion )
{
- // Alle nebeneinanderliegen Fenster invalidieren
+ // Alle nebeneinanderliegenden Fenster invalidieren
// Noch nicht komplett implementiert !!!
Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) );
Window* pWindow = NULL;
@@ -7235,7 +7235,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags )
pWindow->Invalidate( INVALIDATE_CHILDREN | INVALIDATE_NOTRANSPARENT );
pWindow = pWindow->mpWindowImpl->mpNext;
}
- // Wenn uns ein Fenster welches im Hinterund liegt verdeckt hat,
+ // Wenn uns ein Fenster, welches im Hinterund liegt verdeckt hat,
// dann muessen wir uns neu ausgeben
while ( pWindow )
{
@@ -7386,7 +7386,7 @@ void Window::SetPosSizePixel( long nX, long nY,
pWindow->mpWindowImpl->mpFrame->SetPosSize( nX, nY, nWidth, nHeight, nSysFlags );
- // Resize should be called directly. If we havn't
+ // Resize should be called directly. If we haven't
// set the correct size, we get a second resize from
// the system with the correct size. This can happen
// if the size is to small or to large.
@@ -7763,7 +7763,7 @@ void Window::Update()
if ( pUpdateWindow->mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINT | IMPL_PAINT_PAINTCHILDS) )
{
// und fuer alle ueber uns stehende System-Fenster auch ein Update
- // ausloesen, damit nicht die ganze Zeit luecken stehen bleiben
+ // ausloesen, damit nicht die ganze Zeit Luecken stehen bleiben
Window* pUpdateOverlapWindow = ImplGetFirstOverlapWindow()->mpWindowImpl->mpFirstOverlap;
while ( pUpdateOverlapWindow )
{
@@ -7865,7 +7865,7 @@ sal_Bool Window::HasChildPathFocus( sal_Bool bSystemWindow ) const
DBG_CHKTHIS( Window, ImplDbgCheckWindow );
// #107575#, the first floating window always has the keyboard focus, see also winproc.cxx: ImplGetKeyInputWindow()
- // task was shifted to 6.y, so its commented out
+ // task was shifted to 6.y, so it's commented out
/*
Window* pFocusWin = ImplGetSVData()->maWinData.mpFirstFloat;
if( pFocusWin && pFocusWin->mpWindowImpl->mbFloatWin && ((FloatingWindow *)pFocusWin)->GrabsFocus() )
@@ -8467,7 +8467,7 @@ void Window::ImplCallDeactivateListeners( Window *pNew )
return;
// #100759#, avoid walking the wrong frame's hierarchy
- // eg, undocked docking windows (ImplDockFloatWin)
+ // e.g. undocked docking windows (ImplDockFloatWin)
if ( ImplGetParent() && mpWindowImpl->mpFrameWindow == ImplGetParent()->mpWindowImpl->mpFrameWindow )
ImplGetParent()->ImplCallDeactivateListeners( pNew );
}
@@ -8491,9 +8491,9 @@ void Window::ImplCallActivateListeners( Window *pOld )
//if( !GetParent() || !GetParent()->IsCompoundControl() )
//{
// #100759#, avoid walking the wrong frame's hierarchy
- // eg, undocked docking windows (ImplDockFloatWin)
+ // e.g. undocked docking windows (ImplDockFloatWin)
// #104714#, revert the changes for 100759 because it has a side effect when pOld is a dialog
- // additionally the gallery is not dockable anymore, so 100759 canot occur
+ // additionally the gallery is not dockable anymore, so 100759 cannot occur
if ( ImplGetParent() ) /* && mpWindowImpl->mpFrameWindow == ImplGetParent()->mpWindowImpl->mpFrameWindow ) */
ImplGetParent()->ImplCallActivateListeners( pOld );
else if( (mpWindowImpl->mnStyle & WB_INTROWIN) == 0 )
@@ -8796,7 +8796,7 @@ uno::Reference< XClipboard > Window::GetPrimarySelection()
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > Window::GetAccessible( sal_Bool bCreate )
{
- // do not optimize hierarchy for the top level border win (ie, when there is no parent)
+ // do not optimize hierarchy for the top level border win (i.e. when there is no parent)
/* // do not optimize accessible hierarchy at all to better reflect real VCL hierarchy
if ( GetParent() && ( GetType() == WINDOW_BORDERWINDOW ) && ( GetChildCount() == 1 ) )
//if( !ImplIsAccessibleCandidate() )
@@ -8829,7 +8829,7 @@ sal_Bool Window::ImplIsAccessibleCandidate() const
if( !mpWindowImpl->mbBorderWin )
return sal_True;
else
- // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menues!) are closeable
+ // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menus!) are closeable
if( mpWindowImpl->mbFrame && mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE) )
return sal_True;
else
@@ -8839,7 +8839,7 @@ sal_Bool Window::ImplIsAccessibleCandidate() const
sal_Bool Window::ImplIsAccessibleNativeFrame() const
{
if( mpWindowImpl->mbFrame )
- // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menues!) are closeable
+ // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menus!) are closeable
if( (mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE)) )
return sal_True;
else
@@ -9148,11 +9148,11 @@ sal_uInt16 Window::GetAccessibleRole() const
case WINDOW_FIXEDTEXT: nRole = accessibility::AccessibleRole::LABEL; break;
case WINDOW_FIXEDBORDER:
nRole = accessibility::AccessibleRole::SEPARATOR; break;
- case WINDOW_FIXEDLINE:
+ case WINDOW_FIXEDLINE:
{ if( GetText().Len() > 0 )
- nRole = accessibility::AccessibleRole::LABEL;
+ nRole = accessibility::AccessibleRole::LABEL;
else
- nRole = accessibility::AccessibleRole::SEPARATOR;
+ nRole = accessibility::AccessibleRole::SEPARATOR;
break;
}
//case WINDOW_FIXEDLINE: nRole = accessibility::AccessibleRole::SEPARATOR; break;
@@ -9210,7 +9210,7 @@ sal_uInt16 Window::GetAccessibleRole() const
else if( IsScrollable() )
nRole = accessibility::AccessibleRole::SCROLL_PANE;
else if( ((Window*)this)->ImplGetWindow()->IsMenuFloatingWindow() )
- nRole = accessibility::AccessibleRole::WINDOW; // #106002#, contextmenues are windows (i.e. toplevel)
+ nRole = accessibility::AccessibleRole::WINDOW; // #106002#, contextmenus are windows (i.e. toplevel)
else
// #104051# WINDOW seems to be a bad default role, use LAYEREDPANE instead
// a WINDOW is interpreted as a top-level window, which is typically not the case
@@ -9229,7 +9229,7 @@ void Window::SetAccessibleName( const String& rName )
String oldName = GetAccessibleName();
delete mpWindowImpl->mpAccessibleInfos->pAccessibleName;
mpWindowImpl->mpAccessibleInfos->pAccessibleName = new String( rName );
- ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );
+ ImplCallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName );
}
String Window::GetAccessibleName() const
@@ -9345,21 +9345,21 @@ void Window::SetAccessibleRelationLabeledBy( Window* pLabeledBy )
{
if ( !mpWindowImpl->mpAccessibleInfos )
mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
- mpWindowImpl->mpAccessibleInfos->pLabeledByWindow = pLabeledBy;
+ mpWindowImpl->mpAccessibleInfos->pLabeledByWindow = pLabeledBy;
}
void Window::SetAccessibleRelationLabelFor( Window* pLabelFor )
{
if ( !mpWindowImpl->mpAccessibleInfos )
mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
- mpWindowImpl->mpAccessibleInfos->pLabelForWindow = pLabelFor;
+ mpWindowImpl->mpAccessibleInfos->pLabelForWindow = pLabelFor;
}
void Window::SetAccessibleRelationMemberOf( Window* pMemberOfWin )
{
if ( !mpWindowImpl->mpAccessibleInfos )
mpWindowImpl->mpAccessibleInfos = new ImplAccessibleInfos;
- mpWindowImpl->mpAccessibleInfos->pMemberOfWindow = pMemberOfWin;
+ mpWindowImpl->mpAccessibleInfos->pMemberOfWindow = pMemberOfWin;
}
sal_Bool Window::IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath )
@@ -9407,7 +9407,7 @@ sal_Bool Window::ImplGetCurrentBackgroundColor( Color& rCol )
switch ( GetType() )
{
- // peform special handling here
+ // perform special handling here
case WINDOW_PUSHBUTTON:
case WINDOW_OKBUTTON:
case WINDOW_CANCELBUTTON:
@@ -9452,7 +9452,7 @@ void Window::DrawSelectionBackground( const Rectangle& rRect,
{
if( rRect.IsEmpty() )
return;
-
+
bool bRoundEdges = nCornerRadius > 0;
const StyleSettings& rStyles = GetSettings().GetStyleSettings();
@@ -9470,7 +9470,7 @@ void Window::DrawSelectionBackground( const Rectangle& rRect,
if( !bDark && !bBright && abs( c2-c1 ) < (pPaintColor ? 40 : 75) )
{
- // constrast too low
+ // contrast too low
sal_uInt16 h,s,b;
aSelectionFillCol.RGBtoHSB( h, s, b );
if( b > 50 ) b -= 40;
@@ -9934,7 +9934,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
// preserve graphicsstate
Push();
Region aClipRegion( GetClipRegion() );
- SetClipRegion();
+ SetClipRegion();
GDIMetaFile* pOldMtf = GetConnectMetaFile();
GDIMetaFile aMtf;
@@ -9996,7 +9996,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
SetConnectMetaFile( pOldMtf );
EnableOutput( bOutput );
mpWindowImpl->mbReallyVisible = bRVisible;
-
+
// paint metafile to VDev
VirtualDevice* pMaskedDevice = new VirtualDevice( *i_pTargetOutDev, 0, 0 );
pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel() );
@@ -10018,7 +10018,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
nDeltaX = mnOutWidth - nDeltaX - pChild->mnOutWidth;
long nDeltaY = pChild->GetOutOffYPixel() - GetOutOffYPixel();
Point aPos( i_rPos );
- Point aDelta( nDeltaX, nDeltaY );
+ Point aDelta( nDeltaX, nDeltaY );
aPos += aDelta;
pChild->ImplPaintToDevice( i_pTargetOutDev, aPos );
}
@@ -10037,11 +10037,11 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /*rSize*/ )
{
// FIXME: scaling: currently this is for pixel copying only
-
+
DBG_ASSERT( ! pDev->ImplHasMirroredGraphics(), "PaintToDevice to mirroring graphics" );
DBG_ASSERT( ! pDev->IsRTLEnabled(), "PaintToDevice to mirroring device" );
-
-
+
+
Point aPos = pDev->LogicToPixel( rPos );
Window* pRealParent = NULL;
@@ -10059,7 +10059,7 @@ void Window::PaintToDevice( OutputDevice* pDev, const Point& rPos, const Size& /
sal_Bool bVisible = mpWindowImpl->mbVisible;
mpWindowImpl->mbVisible = sal_True;
-
+
if( mpWindowImpl->mpBorderWindow )
mpWindowImpl->mpBorderWindow->ImplPaintToDevice( pDev, rPos );
else
@@ -10080,4 +10080,3 @@ Selection Window::GetSurroundingTextSelection() const
{
return Selection( 0, 0 );
}
-
diff --git a/main/vcl/source/window/winproc.cxx b/main/vcl/source/window/winproc.cxx
index 4c452b6..eb17e30 100644
--- a/main/vcl/source/window/winproc.cxx
+++ b/main/vcl/source/window/winproc.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -354,7 +354,7 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
ImplFrameData* pWinFrameData = pWindow->ImplGetFrameData();
sal_uInt16 nOldCode = pWinFrameData->mnMouseCode;
- // we need a mousemove event, befor we get a mousebuttondown or a
+ // we need a mousemove event, before we get a mousebuttondown or a
// mousebuttonup event
if ( (nSVEvent == EVENT_MOUSEBUTTONDOWN) ||
(nSVEvent == EVENT_MOUSEBUTTONUP) )
@@ -471,9 +471,9 @@ long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouse
MouseEvent aMEvt( aChildPos, pWinFrameData->mnClickCount, nMode, nCode, nCode );
NotifyEvent aNEvt( nSVEvent, pChild, &aMEvt );
Application::CallEventHooks( aNEvt );
-
+
if( pChild->IsCallHandlersOnInputDisabled() )
- {
+ {
pWinFrameData->mpMouseMoveWin = pChild;
pChild->ImplNotifyKeyMouseCommandEventListeners( aNEvt );
}
@@ -962,7 +962,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
sal_uInt16 nEvCode = aKeyCode.GetCode();
// allow application key listeners to remove the key event
- // but make sure we're not forwarding external KeyEvents, (ie where bForward is sal_False)
+ // but make sure we're not forwarding external KeyEvents, (i.e. where bForward is sal_False)
// because those are coming back from the listener itself and MUST be processed
KeyEvent aKeyEvent( (xub_Unicode)nCharCode, aKeyCode, nRepeat );
if( bForward )
@@ -1202,7 +1202,7 @@ static long ImplHandleKey( Window* pWindow, sal_uInt16 nSVEvent,
nRet = 0;
}
- // #105591# send keyinput to parent if we are a floating window and the key was not pocessed yet
+ // #105591# send keyinput to parent if we are a floating window and the key was not processed yet
if( !nRet && pWindow->ImplGetWindowImpl()->mbFloatWin && pWindow->GetParent() && (pWindow->ImplGetWindowImpl()->mpFrame != pWindow->GetParent()->ImplGetWindowImpl()->mpFrame) )
{
pChild = pWindow->GetParent();
@@ -1250,7 +1250,7 @@ static long ImplHandleExtTextInput( Window* pWindow,
{
ImplSVData* pSVData = ImplGetSVData();
Window* pChild = NULL;
-
+
int nTries = 200;
while( nTries-- )
{
@@ -1483,7 +1483,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv
Point aMousePos( rEvt.mnX, rEvt.mnY );
sal_Bool bRet = sal_True;
- // first check any floating window ( eg. drop down listboxes)
+ // first check any floating window ( e.g. drop down listboxes)
bool bIsFloat = false;
Window *pMouseWindow = NULL;
if ( pSVData->maWinData.mpFirstFloat && !pSVData->maWinData.mpCaptureWin &&
@@ -1536,7 +1536,7 @@ static long ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv
}
}
}
-
+
// close floaters
if( ! bIsFloat && pSVData->maWinData.mpFirstFloat )
{
@@ -1655,7 +1655,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
if( bStartTimer )
pWindow->ImplGetWindowImpl()->mpFrameData->maResizeTimer.Start();
else
- pWindow->ImplCallResize(); // otherwise menues cannot be positioned
+ pWindow->ImplCallResize(); // otherwise menus cannot be positioned
}
else
pWindow->ImplGetWindowImpl()->mbCallResize = sal_True;
@@ -1733,7 +1733,7 @@ IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG )
ImplGetWindowImpl()->mpFrameData->mnFocusId = 0;
// Wenn Status erhalten geblieben ist, weil wir den Focus in der
- // zwischenzeit schon wiederbekommen haben, brauchen wir auch
+ // Zwischenzeit schon wiederbekommen haben, brauchen wir auch
// nichts machen
sal_Bool bHasFocus = ImplGetWindowImpl()->mpFrameData->mbHasFocus || ImplGetWindowImpl()->mpFrameData->mbSysObjFocus;
@@ -1794,7 +1794,7 @@ IMPL_LINK( Window, ImplAsyncFocusHdl, void*, EMPTYARG )
if ( pFocusWin->ImplGetWindowImpl()->mpCursor )
pFocusWin->ImplGetWindowImpl()->mpCursor->ImplHide( true );
- // Deaktivate rufen
+ // Deactivate rufen
Window* pOldFocusWindow = pFocusWin;
if ( pOldFocusWindow )
{
@@ -2274,7 +2274,7 @@ static long ImplHandleShowDialog( Window* pWindow, int nDialogId )
{
if( ! pWindow )
return sal_False;
-
+
if( pWindow->GetType() == WINDOW_BORDERWINDOW )
{
Window* pWrkWin = pWindow->GetWindow( WINDOW_CLIENT );