[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri May 21 06:21:48 PDT 2010
patches/dev300/apply | 13
patches/dev300/calc-formula-r1c1-ui-fix.diff | 8
patches/dev300/calc-insert-new-sheet-tab-accessibility.diff | 39 -
patches/dev300/calc-insert-new-sheet-tab-svtools.diff | 346 +-----------
4 files changed, 62 insertions(+), 344 deletions(-)
New commits:
commit 57845c440ad849d676733f1b493ae00cf526aa81
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri May 21 09:21:33 2010 -0400
Got all my patches to apply again.
* patches/dev300/apply:
* patches/dev300/calc-formula-r1c1-ui-fix.diff:
* patches/dev300/calc-insert-new-sheet-tab-accessibility.diff:
* patches/dev300/calc-insert-new-sheet-tab-svtools.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3514e97..8662f81 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3527,9 +3527,9 @@ calc-distributed-cell-text-sc-fix.diff, n#595625, kohei
calc-distributed-cell-text-sc-fix2.diff, n#597658, kohei
# Add a new sheet tab in Calc.
-# FIXME dev300-m77 calc-insert-new-sheet-tab-sc.diff, kohei
-# FIXME dev300-m77 calc-insert-new-sheet-tab-svtools.diff, kohei
-# FIXME dev300-m77 calc-insert-new-sheet-tab-accessibility.diff, kohei
+calc-insert-new-sheet-tab-sc.diff, kohei
+calc-insert-new-sheet-tab-svl.diff, kohei
+calc-insert-new-sheet-tab-svtools.diff, kohei
# Support English function names in place of localized ones.
calc-english-func-names-sc.diff, i#38765, kohei
@@ -3555,7 +3555,7 @@ calc-last-used-function-opcode-fix.diff, kohei
calc-formula-matrix-no-autocalc.diff, n#503918, kohei
# Fix auto-sum and reference selection for function wizard in R1C1 mode.
-# FIXME dev300-m77 calc-formula-r1c1-ui-fix.diff, n#595078, n#595080, kohei
+calc-formula-r1c1-ui-fix.diff, n#595078, n#595080, kohei
# Fix handling of DB functions.
calc-formula-db-function-fix.diff, n#594332, n#595713, kohei
@@ -3572,11 +3572,6 @@ calc-perf-xlsx-import-string-cells.diff, n#594513, kohei
# Fix parse error on minus operator e.g. R[-2]C-R[-1]C.
calc-formula-r1c1-parser-fix.diff, n#604903, kohei
-# Create mdds module.
-# FIXME dev300-m77 mdds-makefile-mk.diff, kohei
-# FIXME dev300-m77 mdds-prj-build-lst.diff, kohei
-# FIXME dev300-m77 mdds-prj-d-lst.diff, kohei
-# FIXME dev300-m77 mdds-build-dependency-sc.diff, kohei
system-mdds.diff, rengelha
[ GentooExperimental ]
diff --git a/patches/dev300/calc-formula-r1c1-ui-fix.diff b/patches/dev300/calc-formula-r1c1-ui-fix.diff
index 28feec4..228e07c 100644
--- a/patches/dev300/calc-formula-r1c1-ui-fix.diff
+++ b/patches/dev300/calc-formula-r1c1-ui-fix.diff
@@ -92,15 +92,15 @@ diff --git sc/source/ui/view/viewfun2.cxx sc/source/ui/view/viewfun2.cxx
index a4dcc8c..8b99440 100644
--- sc/source/ui/view/viewfun2.cxx
+++ sc/source/ui/view/viewfun2.cxx
-@@ -90,6 +90,11 @@
-
- #include "tabbgcolor.hxx" //DBW
+@@ -90,7 +90,11 @@
+ #include "charthelper.hxx"
+ #include "tabbgcolor.hxx"
+#include <boost/scoped_ptr.hpp>
+
+using ::rtl::OUStringBuffer;
+using ::rtl::OUString;
-+
+
// STATIC DATA ---------------------------------------------------------------
diff --git a/patches/dev300/calc-insert-new-sheet-tab-accessibility.diff b/patches/dev300/calc-insert-new-sheet-tab-accessibility.diff
deleted file mode 100644
index 6425f98..0000000
--- a/patches/dev300/calc-insert-new-sheet-tab-accessibility.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-From 033508eecaa39fb6a58133d4a7669dd39b889722 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:08:09 +0200
-Subject: [PATCH 704/768] calc-insert-new-sheet-tab-accessibility.diff
-
----
- .../source/extended/accessibletabbarbase.cxx | 2 +-
- .../source/extended/accessibletabbarpagelist.cxx | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git accessibility/source/extended/accessibletabbarbase.cxx accessibility/source/extended/accessibletabbarbase.cxx
-index 36e3378..c908508 100644
---- accessibility/source/extended/accessibletabbarbase.cxx
-+++ accessibility/source/extended/accessibletabbarbase.cxx
-@@ -63,7 +63,7 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclSimpleEvent*, pEvent )
- DBG_ASSERT( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" );
-
- if( ( pWinEvent->GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) &&
-- ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TABBAR_PAGE_NOTFOUND ) &&
-+ ( (sal_uInt16)(sal_IntPtr) pWinEvent->GetData() == TabBar::PAGE_NOT_FOUND ) &&
- ( dynamic_cast< AccessibleTabBarPageList *> (this) != NULL ) )
- {
- return 0;
-diff --git accessibility/source/extended/accessibletabbarpagelist.cxx accessibility/source/extended/accessibletabbarpagelist.cxx
-index 50c6359..6f5c447 100644
---- accessibility/source/extended/accessibletabbarpagelist.cxx
-+++ accessibility/source/extended/accessibletabbarpagelist.cxx
-@@ -313,7 +313,7 @@ namespace accessibility
- {
- sal_uInt16 nPageId = (sal_uInt16)(sal_IntPtr) rVclWindowEvent.GetData();
-
-- if ( nPageId == TABBAR_PAGE_NOTFOUND )
-+ if ( nPageId == TabBar::PAGE_NOT_FOUND )
- {
- for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i )
- RemoveChild( i );
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-insert-new-sheet-tab-svtools.diff b/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
index 3a72f39..bb21dc5 100644
--- a/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
+++ b/patches/dev300/calc-insert-new-sheet-tab-svtools.diff
@@ -1,29 +1,5 @@
-From f7a860f26ddde33c4e614c661546de6419035c68 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:08:08 +0200
-Subject: [PATCH 703/768] calc-insert-new-sheet-tab-svtools.diff
-
----
- svl/inc/svl/svtools.hrc | 1 +
- svtools/inc/tabbar.hxx | 19 +-
- svtools/source/control/tabbar.cxx | 725 ++++++++++++++++++++++++-------------
- svtools/source/misc/imagemgr.src | 9 +
- 4 files changed, 490 insertions(+), 264 deletions(-)
-
-diff --git svl/inc/svl/svtools.hrc svl/inc/svl/svtools.hrc
-index 3a64a3a..fddc670 100644
---- svl/inc/svl/svtools.hrc
-+++ svl/inc/svl/svtools.hrc
-@@ -427,6 +427,7 @@
- #define BMP_HELP_AGENT_IMAGE (RID_SVTOOLS_BITMAP_START + 1)
- #define BMP_HELP_AGENT_CLOSER (RID_SVTOOLS_BITMAP_START + 2)
- #define BMP_PLUGIN (RID_SVTOOLS_BITMAP_START + 3)
-+#define BMP_LIST_ADD (RID_SVTOOLS_BITMAP_START + 4)
-
- //.............................................................................
- // image lists
diff --git svtools/inc/tabbar.hxx svtools/inc/tabbar.hxx
-index 70e7950..36dd938 100644
+index ee19bfc..3ecea7b 100644
--- svtools/inc/tabbar.hxx
+++ svtools/inc/tabbar.hxx
@@ -302,6 +302,7 @@ ueber einem bzw. ueber welchem Item durchgefuehrt wurde.
@@ -34,7 +10,7 @@ index 70e7950..36dd938 100644
#define WB_STDTABBAR WB_BORDER
// ------------------
-@@ -331,6 +329,7 @@ typedef USHORT TabBarPageBits;
+@@ -328,6 +329,7 @@ typedef USHORT TabBarPageBits;
// - TabBar -
// ----------
struct TabBar_Impl;
@@ -42,7 +18,7 @@ index 70e7950..36dd938 100644
class SVT_DLLPUBLIC TabBar : public Window
{
-@@ -374,6 +373,7 @@ private:
+@@ -371,6 +373,7 @@ private:
BOOL mbSelColor;
BOOL mbSelTextColor;
BOOL mbMirrored;
@@ -50,7 +26,7 @@ index 70e7950..36dd938 100644
Link maSelectHdl;
Link maDoubleClickHdl;
Link maSplitHdl;
-@@ -397,11 +397,16 @@ private:
+@@ -394,11 +397,15 @@ private:
SVT_DLLPRIVATE void ImplSelect();
SVT_DLLPRIVATE void ImplActivatePage();
SVT_DLLPRIVATE long ImplDeactivatePage();
@@ -63,10 +39,9 @@ index 70e7950..36dd938 100644
static const sal_uInt16 APPEND;
static const sal_uInt16 PAGE_NOT_FOUND;
+ static const sal_uInt16 INSERT_TAB_POS;
-+
+
TabBar( Window* pParent, WinBits nWinStyle = WB_STDTABBAR );
virtual ~TabBar();
-
@@ -443,7 +450,7 @@ public:
USHORT GetPageCount() const;
USHORT GetPageId( USHORT nPos ) const;
@@ -77,22 +52,20 @@ index 70e7950..36dd938 100644
// returns the rectangle in which page tabs are drawn
Rectangle GetPageArea() const;
diff --git svtools/source/control/tabbar.cxx svtools/source/control/tabbar.cxx
-index 72a7f80..efb9cd3 100644
+index 36dccc3..360d75a 100644
--- svtools/source/control/tabbar.cxx
+++ svtools/source/control/tabbar.cxx
-@@ -39,6 +39,11 @@
+@@ -39,6 +39,9 @@
#include <vcl/edit.hxx>
#include "svtaccessiblefactory.hxx"
+#include "svtools/svtools.hrc"
+#include "svtools/svtdata.hxx"
+
-+#include <limits>
-+
- // =======================================================================
+ #include <limits>
- #define TABBAR_OFFSET_X 7
-@@ -63,9 +68,7 @@ struct ImplTabBarItem
+ // =======================================================================
+@@ -65,9 +68,7 @@ struct ImplTabBarItem
BOOL mbSelect;
BOOL mbEnable;
Color maTabBgColor;
@@ -102,7 +75,7 @@ index 72a7f80..efb9cd3 100644
ImplTabBarItem( USHORT nItemId, const XubString& rText,
TabBarPageBits nPageBits ) :
-@@ -81,6 +84,21 @@ struct ImplTabBarItem
+@@ -83,6 +84,21 @@ struct ImplTabBarItem
maTabBgColor = Color( COL_AUTO );
maTabTextColor = Color( COL_AUTO );
}
@@ -124,18 +97,15 @@ index 72a7f80..efb9cd3 100644
};
DECLARE_LIST( ImplTabBarList, ImplTabBarItem* )
-@@ -354,6 +372,10 @@ struct TabBar_Impl
+@@ -358,6 +374,7 @@ struct TabBar_Impl
- // =======================================================================
+ const sal_uInt16 TabBar::APPEND = ::std::numeric_limits<sal_uInt16>::max();
+ const sal_uInt16 TabBar::PAGE_NOT_FOUND = ::std::numeric_limits<sal_uInt16>::max();
++const sal_uInt16 TabBar::INSERT_TAB_POS = ::std::numeric_limits<USHORT>::max() - 1;
-+const USHORT TabBar::APPEND = ::std::numeric_limits<USHORT>::max();
-+const USHORT TabBar::PAGE_NOT_FOUND = ::std::numeric_limits<USHORT>::max();
-+const USHORT TabBar::INSERT_TAB_POS = ::std::numeric_limits<USHORT>::max() - 1;
-+
void TabBar::ImplInit( WinBits nWinStyle )
{
- mpItemList = new ImplTabBarList;
-@@ -388,6 +410,7 @@ void TabBar::ImplInit( WinBits nWinStyle )
+@@ -393,6 +410,7 @@ void TabBar::ImplInit( WinBits nWinStyle )
mbSelColor = FALSE;
mbSelTextColor = FALSE;
mbMirrored = FALSE;
@@ -143,8 +113,11 @@ index 72a7f80..efb9cd3 100644
if ( nWinStyle & WB_3DTAB )
mnOffY++;
-@@ -1006,282 +1029,384 @@ void TabBar::MouseButtonUp( const MouseEvent& rMEvt )
+@@ -1009,288 +1027,390 @@ void TabBar::MouseButtonUp( const MouseEvent& rMEvt )
+ Window::MouseButtonUp( rMEvt );
+ }
++
// -----------------------------------------------------------------------
-void TabBar::Paint( const Rectangle& )
@@ -194,14 +167,14 @@ index 72a7f80..efb9cd3 100644
+ mbEnabled(false)
+ {
+ }
-+
-+ void drawOutputAreaBorder()
-+ {
-+ WinBits nWinStyle = mrParent.GetStyle();
- // Beim ersten Format auch dafuer sorgen, das aktuelle TabPage
- // sichtbar wird
- if ( mbFirstFormat )
++ void drawOutputAreaBorder()
++ {
++ WinBits nWinStyle = mrParent.GetStyle();
++
+ // Bei Border oben und unten einen Strich extra malen
+ if ( (nWinStyle & WB_BORDER) || (nWinStyle & WB_TOPBORDER) )
{
@@ -472,7 +445,7 @@ index 72a7f80..efb9cd3 100644
- aPos2.X()--;
- aPos3.X()--;
-
-- // If this is the current tab, draw the left inner shadow the default color,
+- // If this is the current tab, draw the left inner shadow the default color,
- // otherwise make it the same as the custom background color
- if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
- SetLineColor( rStyleSettings.GetLightColor() );
@@ -535,10 +508,7 @@ index 72a7f80..efb9cd3 100644
+ }
- // draw a small 2px sliver of the original background color at the bottom of the selected tab
-+ void setRect(const Rectangle& rRect)
-+ {
-+ maRect = rRect;
-
+-
- if ( !pItem->IsDefaultTabBgColor() )
- {
- if ( pItem->mbSelect || (pItem->mnId == mnCurPageId) ) {
@@ -550,19 +520,16 @@ index 72a7f80..efb9cd3 100644
- DrawText( aTxtPos, aText );
- }
- }
-+ long nOffY = mrParent.GetPageArea().getY();
++ void setRect(const Rectangle& rRect)
++ {
++ maRect = rRect;
- // Da etwas uebermalt werden konnte, muessen wir die Polygon-
- // umrandung nocheinmal ausgeben
- SetLineColor( rStyleSettings.GetDarkShadowColor() );
- SetFillColor();
- DrawPolygon( aPoly );
-+ // Zuerst geben wir das Polygon gefuellt aus
-+ maPoly[0] = Point( rRect.Left(), nOffY );
-+ maPoly[1] = Point( rRect.Left()+TABBAR_OFFSET_X, rRect.Bottom() );
-+ maPoly[2] = Point( rRect.Right()-TABBAR_OFFSET_X, rRect.Bottom() );
-+ maPoly[3] = Point( rRect.Right(), nOffY );
-+ }
++ long nOffY = mrParent.GetPageArea().getY();
- // Beim dem aktuellen Tab die restlichten Ausgaben vornehmen und
- // die Schleife abbrechen, da die aktuelle Tab als letztes
@@ -580,16 +547,18 @@ index 72a7f80..efb9cd3 100644
- aDelRect.Top()--;
- DrawRect( aDelRect );
- }
-+ void setSelected(bool b)
-+ {
-+ mbSelected = b;
++ // Zuerst geben wir das Polygon gefuellt aus
++ maPoly[0] = Point( rRect.Left(), nOffY );
++ maPoly[1] = Point( rRect.Left()+TABBAR_OFFSET_X, rRect.Bottom() );
++ maPoly[2] = Point( rRect.Right()-TABBAR_OFFSET_X, rRect.Bottom() );
++ maPoly[3] = Point( rRect.Right(), nOffY );
+ }
- break;
- }
-+ void setCustomColored(bool b)
++ void setSelected(bool b)
+ {
-+ mbCustomColored = b;
++ mbSelected = b;
+ }
- pItem = mpItemList->Prev();
@@ -598,13 +567,18 @@ index 72a7f80..efb9cd3 100644
- {
- if ( pItem == pCurItem )
- break;
-+ void setSpecialTab(bool b)
++ void setCustomColored(bool b)
+ {
-+ mbSpecialTab = b;
++ mbCustomColored = b;
+ }
- pItem = NULL;
- }
++ void setSpecialTab(bool b)
++ {
++ mbSpecialTab = b;
++ }
++
+ void setEnabled(bool b)
+ {
+ mbEnabled = b;
@@ -628,7 +602,7 @@ index 72a7f80..efb9cd3 100644
+private:
+ TabBar& mrParent;
+ const StyleSettings* mpStyleSettings;
-
++
+ Rectangle maRect;
+ Polygon maPoly;
+
@@ -679,7 +653,7 @@ index 72a7f80..efb9cd3 100644
+ aDrawer.drawTab();
+ aDrawer.drawPlusImage();
+ }
-+
+
+ ImplTabBarItem* pCurItem = NULL;
+ while ( pItem )
+ {
@@ -759,7 +733,11 @@ index 72a7f80..efb9cd3 100644
}
// -----------------------------------------------------------------------
-@@ -1541,6 +1666,80 @@ long TabBar::ImplDeactivatePage()
+-
+ void TabBar::Resize()
+ {
+ Size aNewSize = GetOutputSizePixel();
+@@ -1546,6 +1666,80 @@ long TabBar::ImplDeactivatePage()
return nRet;
}
@@ -840,112 +818,16 @@ index 72a7f80..efb9cd3 100644
// -----------------------------------------------------------------------
long TabBar::DeactivatePage()
-@@ -1591,7 +1790,7 @@ void TabBar::InsertPage( USHORT nPageId, const XubString& rText,
- TabBarPageBits nBits, USHORT nPos )
- {
- DBG_ASSERT( nPageId, "TabBar::InsertPage(): PageId == 0" );
-- DBG_ASSERT( GetPagePos( nPageId ) == TABBAR_PAGE_NOTFOUND,
-+ DBG_ASSERT( GetPagePos( nPageId ) == PAGE_NOT_FOUND,
- "TabBar::InsertPage(): PageId already exists" );
- DBG_ASSERT( nBits <= TPB_SPECIAL, "TabBar::InsertPage(): nBits is wrong" );
-
-@@ -1617,7 +1816,7 @@ Color TabBar::GetTabBgColor( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->maTabBgColor;
- else
- return Color( COL_AUTO );
-@@ -1627,7 +1826,7 @@ void TabBar::SetTabBgColor( USHORT nPageId, const Color& aTabBgColor )
- {
- USHORT nPos = GetPagePos( nPageId );
- ImplTabBarItem* pItem;
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- pItem = mpItemList->GetObject( nPos );
- // TODO: Need to take the text color specification out of this code!
-@@ -1654,7 +1853,7 @@ void TabBar::RemovePage( USHORT nPageId )
- USHORT nPos = GetPagePos( nPageId );
-
- // Existiert Item
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- if ( mnCurPageId == nPageId )
- mnCurPageId = 0;
-@@ -1689,7 +1888,7 @@ void TabBar::MovePage( USHORT nPageId, USHORT nNewPos )
- return;
-
- // Existiert Item
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- // TabBar-Item in der Liste verschieben
- ImplTabBarItem* pItem = mpItemList->Remove( nPos );
-@@ -1727,7 +1926,7 @@ void TabBar::Clear()
- if ( IsReallyVisible() && IsUpdateMode() )
- Invalidate();
-
-- CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, (void*) TABBAR_PAGE_NOTFOUND );
-+ CallEventListeners( VCLEVENT_TABBAR_PAGEREMOVED, (void*) PAGE_NOT_FOUND );
- }
-
- // -----------------------------------------------------------------------
-@@ -1736,7 +1935,7 @@ void TabBar::EnablePage( USHORT nPageId, BOOL bEnable )
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
-
-@@ -1759,7 +1958,7 @@ BOOL TabBar::IsPageEnabled( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->mbEnable;
- else
- return FALSE;
-@@ -1771,7 +1970,7 @@ void TabBar::SetPageBits( USHORT nPageId, TabBarPageBits nBits )
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
-
-@@ -1792,7 +1991,7 @@ TabBarPageBits TabBar::GetPageBits( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->mnBits;
- else
- return FALSE;
-@@ -1829,12 +2028,12 @@ USHORT TabBar::GetPagePos( USHORT nPageId ) const
- pItem = mpItemList->Next();
- }
-
-- return TABBAR_PAGE_NOTFOUND;
-+ return PAGE_NOT_FOUND;
- }
+@@ -1838,7 +2032,7 @@ USHORT TabBar::GetPagePos( USHORT nPageId ) const
// -----------------------------------------------------------------------
-USHORT TabBar::GetPageId( const Point& rPos ) const
-+USHORT TabBar::GetPageId( const Point& rPos, bool bCheckInsTab ) const
++sal_uInt16 TabBar::GetPageId( const Point& rPos, bool bCheckInsTab ) const
{
ImplTabBarItem* pItem = mpItemList->First();
while ( pItem )
-@@ -1845,6 +2044,16 @@ USHORT TabBar::GetPageId( const Point& rPos ) const
+@@ -1849,6 +2043,16 @@ USHORT TabBar::GetPageId( const Point& rPos ) const
pItem = mpItemList->Next();
}
@@ -962,123 +844,6 @@ index 72a7f80..efb9cd3 100644
return 0;
}
-@@ -1854,7 +2063,7 @@ Rectangle TabBar::GetPageRect( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->maRect;
- else
- return Rectangle();
-@@ -1867,7 +2076,7 @@ void TabBar::SetCurPageId( USHORT nPageId )
- USHORT nPos = GetPagePos( nPageId );
-
- // Wenn Item nicht existiert, dann nichts machen
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- // Wenn sich aktuelle Page nicht geaendert hat, dann muessen wir
- // jetzt nichts mehr machen
-@@ -1959,7 +2168,7 @@ void TabBar::MakeVisible( USHORT nPageId )
- USHORT nPos = GetPagePos( nPageId );
-
- // Wenn Item nicht existiert, dann nichts machen
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- if ( nPos < mnFirstPos )
- SetFirstPageId( nPageId );
-@@ -2008,7 +2217,7 @@ void TabBar::SetFirstPageId( USHORT nPageId )
- USHORT nPos = GetPagePos( nPageId );
-
- // Wenn Item nicht existiert, dann FALSE zurueckgeben
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- if ( nPos != mnFirstPos )
- {
-@@ -2042,7 +2251,7 @@ void TabBar::SelectPage( USHORT nPageId, BOOL bSelect )
- {
- USHORT nPos = GetPagePos( nPageId );
-
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
-
-@@ -2123,7 +2332,7 @@ USHORT TabBar::GetSelectPageCount() const
- BOOL TabBar::IsPageSelected( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->mbSelect;
- else
- return FALSE;
-@@ -2134,7 +2343,7 @@ BOOL TabBar::IsPageSelected( USHORT nPageId ) const
- BOOL TabBar::StartEditMode( USHORT nPageId )
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( mpEdit || (nPos == TABBAR_PAGE_NOTFOUND) || (mnLastOffX < 8) )
-+ if ( mpEdit || (nPos == PAGE_NOT_FOUND) || (mnLastOffX < 8) )
- return FALSE;
-
- mnEditId = nPageId;
-@@ -2355,7 +2564,7 @@ void TabBar::SetSelectTextColor( const Color& rColor )
- void TabBar::SetPageText( USHORT nPageId, const XubString& rText )
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- mpItemList->GetObject( nPos )->maText = rText;
- mbSizeFormat = TRUE;
-@@ -2373,7 +2582,7 @@ void TabBar::SetPageText( USHORT nPageId, const XubString& rText )
- XubString TabBar::GetPageText( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->maText;
- else
- return XubString();
-@@ -2384,7 +2593,7 @@ XubString TabBar::GetPageText( USHORT nPageId ) const
- void TabBar::SetHelpText( USHORT nPageId, const XubString& rText )
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- mpItemList->GetObject( nPos )->maHelpText = rText;
- }
-
-@@ -2393,7 +2602,7 @@ void TabBar::SetHelpText( USHORT nPageId, const XubString& rText )
- XubString TabBar::GetHelpText( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- {
- ImplTabBarItem* pItem = mpItemList->GetObject( nPos );
- if ( !pItem->maHelpText.Len() && pItem->mnHelpId )
-@@ -2414,7 +2623,7 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const
- void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId )
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- mpItemList->GetObject( nPos )->mnHelpId = nHelpId;
- }
-
-@@ -2423,7 +2632,7 @@ void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId )
- ULONG TabBar::GetHelpId( USHORT nPageId ) const
- {
- USHORT nPos = GetPagePos( nPageId );
-- if ( nPos != TABBAR_PAGE_NOTFOUND )
-+ if ( nPos != PAGE_NOT_FOUND )
- return mpItemList->GetObject( nPos )->mnHelpId;
- else
- return 0;
diff --git svtools/source/misc/imagemgr.src svtools/source/misc/imagemgr.src
index 7f30a27..7d95918 100644
--- svtools/source/misc/imagemgr.src
@@ -1099,6 +864,3 @@ index 7f30a27..7d95918 100644
// description strings
String STR_DESCRIPTION_SOURCEFILE
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list