[Libreoffice-commits] .: editeng/source framework/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Oct 10 02:40:47 PDT 2010
editeng/source/editeng/editeng.cxx | 10 ++++++----
framework/source/uielement/toolbarmanager.cxx | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit d6e6f60d0b04254ec2674527d3cc6c4688d7070a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 04:30:30 2010 -0500
squash warning. LONG_MAX is not compatible with sal_Int32
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1a92b1d..76f6886 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2482,10 +2482,12 @@ void __EXPORT EditEngine::DrawingText( const Point&, const XubString&, USHORT, U
DBG_CHKTHIS( EditEngine, 0 );
}
-void __EXPORT EditEngine::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar,
- const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
- bool bEndOfLine, bool bEndOfParagraph,
- const Color& rOverlineColor, const Color& rTextLineColor)
+void __EXPORT EditEngine::DrawingTab( const Point& /*rStartPos*/, long /*nWidth*/,
+ const String& /*rChar*/, const SvxFont& /*rFont*/,
+ USHORT /*nPara*/, xub_StrLen /*nIndex*/,
+ BYTE /*nRightToLeft*/, bool /*bEndOfLine*/,
+ bool /*bEndOfParagraph*/, const Color& /*rOverlineColor*/,
+ const Color& /*rTextLineColor*/)
{
DBG_CHKTHIS( EditEngine, 0 );
}
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 82c6729..4ea3cd0 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -498,7 +498,7 @@ void ToolBarManager::UpdateControllers()
if ( xLayoutManager.is() && xDockable.is() )
{
::com::sun::star::awt::Point aPoint;
- aPoint.X = aPoint.Y = LONG_MAX;
+ aPoint.X = aPoint.Y = SAL_MAX_INT32;
xLayoutManager->dockWindow( m_aResourceName, DockingArea_DOCKINGAREA_DEFAULT, aPoint );
xLayoutManager->lockWindow( m_aResourceName );
}
More information about the Libreoffice-commits
mailing list