[ooo-build-commit] 45 commits - bin/modules2.txt bin/unpack configure.in download.in patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Aug 10 09:24:03 PDT 2009
bin/modules2.txt | 5
bin/unpack | 20
configure.in | 2
download.in | 4
patches/dev300/apply | 69 -
patches/dev300/buildfix-fmtargs.diff | 42
patches/dev300/cjk-character-units-fix-376788.diff | 4
patches/dev300/cjk-character-units-imp.diff | 4
patches/dev300/customunittext-percent.diff | 8
patches/dev300/customunittext-pixel.diff | 8
patches/dev300/fix-gtk-a11y.diff | 43
patches/dev300/form-control-visibility.diff | 934 ----------------
patches/dev300/forms-radio-button-group-names.diff | 29
patches/dev300/i97329-sslwarndlg-truncation.diff | 45
patches/dev300/import-controls-tooltip.diff | 60 -
patches/dev300/libwpd.diff | 4
patches/dev300/offapi-typecheck-whitelist.diff | 2
patches/dev300/padmin-nofontconfig.diff | 27
patches/dev300/quiet-build-more.diff | 66 -
patches/dev300/quiet-build.diff | 323 ++---
patches/dev300/sc-dataform-sc.diff | 16
patches/dev300/sc-datapilot-autoformat.diff | 32
patches/dev300/sc-datapilot-dynamic-range.diff | 560 ---------
patches/dev300/sc-dp-gridlayout.diff | 16
patches/dev300/sc-natural-sort.diff | 40
patches/dev300/sfx2-check-existing-template-dirs.diff | 13
patches/dev300/shell-senddoc-library-path.diff | 12
patches/dev300/speed-configmgr-misc.diff | 61 -
patches/dev300/speed-configmgr-nodesort.diff | 26
patches/dev300/speed-getfilestatus-dtype.diff | 252 ----
patches/dev300/speed-lingucomponent.diff | 89 -
patches/dev300/speed-make-installer-2.diff | 62 -
patches/dev300/speed-make-installer.diff | 124 --
patches/dev300/speed-pagein.diff | 24
patches/dev300/speed-sal-fewer-lstats.diff | 60 -
patches/dev300/svx-dialogs-resize.diff | 12
patches/dev300/svx-honour-customshape-capabilities.diff | 11
patches/dev300/sw-dialogs-resize.diff | 8
patches/dev300/ucb-neon-different-name.diff | 19
patches/dev300/vcl-menu-fixes.diff | 22
patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff | 44
patches/dev300/zoom-combobox.diff | 15
42 files changed, 359 insertions(+), 2858 deletions(-)
New commits:
commit 2884a7a96e8ffd37e7a7b0636b891a636c6ee1b0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 19:16:13 2009 +0300
Adapt sc-natural-sort.diff for dev300-m54.
* patches/dev300/sc-natural-sort.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/sc-natural-sort.diff b/patches/dev300/sc-natural-sort.diff
index 3ef5e83..78c1caa 100644
--- a/patches/dev300/sc-natural-sort.diff
+++ b/patches/dev300/sc-natural-sort.diff
@@ -313,8 +313,8 @@
bIncludePattern = rSortParam.bIncludePattern;
bSortInplace = rSortParam.bInplace;
nSortDestTab = rSortParam.nDestTab;
---- sc/source/ui/dbgui/tpsort.cxx.old 2009-04-02 10:45:25.000000000 +0000
-+++ sc/source/ui/dbgui/tpsort.cxx 2009-04-06 16:41:48.000000000 +0000
+--- sc/source/ui/dbgui/tpsort.cxx
++++ sc/source/ui/dbgui/tpsort.cxx
@@ -555,6 +555,7 @@ ScTabPageSortOptions::ScTabPageSortOptio
aBtnHeader ( this, ScResId( BTN_LABEL ) ),
aBtnFormats ( this, ScResId( BTN_FORMATS ) ),
@@ -331,7 +331,7 @@
+// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
// aFtArea ( this, ScResId( FT_AREA ) ),
//
- aStrRowLabel ( ScResId( STR_ROW_LABEL ) ),
+ #if ENABLE_LAYOUT_EXPERIMENTAL
@@ -605,8 +606,8 @@ __EXPORT ScTabPageSortOptions::~ScTabPag
void ScTabPageSortOptions::Init()
@@ -376,8 +376,8 @@
theSortData.bIncludePattern = aBtnFormats.IsChecked();
theSortData.bInplace = !aBtnCopyResult.IsChecked();
theSortData.nDestCol = theOutPos.Col();
---- sc/source/ui/inc/sortdlg.hrc.old 2009-04-02 10:45:37.000000000 +0000
-+++ sc/source/ui/inc/sortdlg.hrc 2009-04-06 16:41:48.000000000 +0000
+--- sc/source/ui/inc/sortdlg.hrc
++++ sc/source/ui/inc/sortdlg.hrc
@@ -64,7 +64,7 @@
#define LB_SORT_USER 2
#define LB_OUTAREA 3
@@ -393,10 +393,10 @@
#define LB_ALGORITHM 19
+#define BTN_NATURALSORT 20
-
-
---- sc/source/ui/inc/tpsort.hxx.old 2009-04-02 10:45:37.000000000 +0000
-+++ sc/source/ui/inc/tpsort.hxx 2009-04-06 16:41:48.000000000 +0000
+ //#define RID_SCDLG_SORT_WARNING
+ #define FT_TEXT 1
+--- sc/source/ui/inc/tpsort.hxx
++++ sc/source/ui/inc/tpsort.hxx
@@ -53,7 +53,7 @@ class ScSortDlg;
struct ScSortParam;
@@ -430,8 +430,8 @@
- FixedText aFtAreaLabel;
+// FixedText aFtAreaLabel;
// FixedInfo aFtArea;
- String aStrRowLabel;
- String aStrColLabel;
+ LocalizedString aStrRowLabel;
+ LocalizedString aStrColLabel;
--- sc/source/ui/src/sortdlg.src.old 2009-04-02 10:45:23.000000000 +0000
+++ sc/source/ui/src/sortdlg.src 2009-04-06 16:41:48.000000000 +0000
@@ -154,9 +154,20 @@ TabPage RID_SCPAGE_SORT_OPTIONS
@@ -558,16 +558,16 @@
};
TabDialog RID_SCDLG_SORT
{
---- sc/source/ui/view/cellsh2.cxx.old 2009-04-06 16:41:39.000000000 +0000
-+++ sc/source/ui/view/cellsh2.cxx 2009-04-06 16:41:48.000000000 +0000
+--- sc/source/ui/view/cellsh2.cxx
++++ sc/source/ui/view/cellsh2.cxx
@@ -366,6 +366,7 @@ void ScCellShell::ExecuteDB( SfxRequest&
- aSortParam.bHasHeader = bHasHeader;
- aSortParam.bByRow = TRUE;
- aSortParam.bCaseSens = FALSE;
-+ aSortParam.bNaturalSort = FALSE;
- aSortParam.bIncludePattern = FALSE;
- aSortParam.bInplace = TRUE;
- aSortParam.bDoSort[0] = TRUE;
+ aSortParam.bHasHeader = bHasHeader;
+ aSortParam.bByRow = TRUE;
+ aSortParam.bCaseSens = FALSE;
++ aSortParam.bNaturalSort = FALSE;
+ aSortParam.bIncludePattern = TRUE;
+ aSortParam.bInplace = TRUE;
+ aSortParam.bDoSort[0] = TRUE;
@@ -401,6 +402,8 @@ void ScCellShell::ExecuteDB( SfxRequest&
aSortParam.bHasHeader = ((const SfxBoolItem*)pItem)->GetValue();
if ( pArgs->GetItemState( SID_SORT_CASESENS, TRUE, &pItem ) == SFX_ITEM_SET )
commit be47087e1db0e5ebded34a69ca0361750c029500
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 19:09:55 2009 +0300
Adapt sc-dp-gridlayout.diff for dev300-m54.
* patches/dev300/sc-dp-gridlayout.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/sc-dp-gridlayout.diff b/patches/dev300/sc-dp-gridlayout.diff
index c400470..76a35d8 100644
--- a/patches/dev300/sc-dp-gridlayout.diff
+++ b/patches/dev300/sc-dp-gridlayout.diff
@@ -1,8 +1,8 @@
---- sc/inc/dpobject.hxx.old 2009-04-06 16:41:48.000000000 +0000
-+++ sc/inc/dpobject.hxx 2009-04-06 16:41:48.000000000 +0000
+--- sc/inc/dpobject.hxx
++++ sc/inc/dpobject.hxx
@@ -110,6 +110,7 @@ private:
+ USHORT nAutoFormatIndex;
BOOL bAllowMove;
- BOOL bInfoValid; // affects: nHeaderRows
long nHeaderRows; // page fields plus filter button
+ bool bHeaderLayout; // TRUE : grid, FALSE : standard
@@ -10,7 +10,7 @@
SC_DLLPRIVATE void CreateObjects();
@@ -141,6 +142,9 @@ public:
void SetAutoFormatIndex (const USHORT nIndex);
- const USHORT GetAutoFormatIndex () { if (this == NULL) return 65535; else return nAutoFormatIndex; }
+ USHORT GetAutoFormatIndex () { if (this == NULL) return 65535; else return nAutoFormatIndex; }
+ void SetHeaderLayout (bool bUseGrid);
+ bool GetHeaderLayout () const { return bHeaderLayout; }
@@ -38,12 +38,12 @@
static void GetDataDimensionNames( String& rSourceName, String& rGivenName,
const com::sun::star::uno::Reference<
com::sun::star::uno::XInterface>& xDim );
---- sc/source/core/data/dpobject.cxx.old 2009-04-06 16:41:48.000000000 +0000
-+++ sc/source/core/data/dpobject.cxx 2009-04-06 16:41:48.000000000 +0000
+--- sc/source/core/data/dpobject.cxx
++++ sc/source/core/data/dpobject.cxx
@@ -168,7 +168,8 @@ ScDPObject::ScDPObject( ScDocument* pD )
bAlive( FALSE ),
+ nAutoFormatIndex( 65535 ),
bAllowMove( FALSE ),
- bInfoValid( FALSE ),
- nHeaderRows( 0 )
+ nHeaderRows( 0 ),
+ bHeaderLayout( false )
@@ -52,8 +52,8 @@
@@ -188,7 +189,8 @@ ScDPObject::ScDPObject(const ScDPObject&
bAlive( FALSE ),
+ nAutoFormatIndex( r.nAutoFormatIndex ),
bAllowMove( FALSE ),
- bInfoValid( r.bInfoValid ),
- nHeaderRows( r.nHeaderRows )
+ nHeaderRows( r.nHeaderRows ),
+ bHeaderLayout( r.bHeaderLayout )
commit 4978c6bd6a14d2f810f39a76a669c46cd0673908
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 19:05:01 2009 +0300
Adapt sc-datapilot-autoformat.diff for dev300-m54.
* patches/dev300/sc-datapilot-autoformat.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/sc-datapilot-autoformat.diff b/patches/dev300/sc-datapilot-autoformat.diff
index 2e2dce8..7ad5ddb 100644
--- a/patches/dev300/sc-datapilot-autoformat.diff
+++ b/patches/dev300/sc-datapilot-autoformat.diff
@@ -1,13 +1,13 @@
---- sc/inc/dpobject.hxx.old 2009-04-02 10:45:43.000000000 +0000
-+++ sc/inc/dpobject.hxx 2009-04-06 16:41:48.000000000 +0000
+--- sc/inc/dpobject.hxx
++++ sc/inc/dpobject.hxx
@@ -106,6 +106,7 @@ private:
ScDPOutput* pOutput;
BOOL bSettingsChanged;
BOOL bAlive; // FALSE if only used to hold settings
+ USHORT nAutoFormatIndex;
BOOL bAllowMove;
- BOOL bInfoValid; // affects: nHeaderRows
long nHeaderRows; // page fields plus filter button
+
@@ -137,6 +138,9 @@ public:
void SetOutRange(const ScRange& rRange);
const ScRange& GetOutRange() const { return aOutRange; }
@@ -74,24 +74,24 @@
//--------------------------------------------------------------------------
SfxVoidItem DeletePrintArea SID_DELETE_PRINTAREA
()
---- sc/source/core/data/dpobject.cxx.old 2009-04-02 10:45:01.000000000 +0000
-+++ sc/source/core/data/dpobject.cxx 2009-04-06 16:41:48.000000000 +0000
+--- sc/source/core/data/dpobject.cxx
++++ sc/source/core/data/dpobject.cxx
@@ -165,6 +165,7 @@ ScDPObject::ScDPObject( ScDocument* pD ) :
pOutput( NULL ),
bSettingsChanged( FALSE ),
bAlive( FALSE ),
+ nAutoFormatIndex( 65535 ),
bAllowMove( FALSE ),
- bInfoValid( FALSE ),
nHeaderRows( 0 )
+ {
@@ -178,6 +179,7 @@ ScDPObject::ScDPObject(const ScDPObject&
pOutput( NULL ),
bSettingsChanged( FALSE ),
bAlive( FALSE ),
+ nAutoFormatIndex( r.nAutoFormatIndex ),
bAllowMove( FALSE ),
- bInfoValid( r.bInfoValid ),
- nHeaderRows( r.nHeaderRows ),
+ nHeaderRows( r.nHeaderRows )
+ {
@@ -234,6 +236,11 @@ void ScDPObject::SetSaveData(const ScDPS
InvalidateData(); // re-init source from SaveData
}
@@ -166,19 +166,19 @@
ScMarkType GetSimpleArea( ScRange& rRange ) const;
/// May modify rNewMark using MarkToSimple().
ScMarkType GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const;
---- sc/source/ui/miscdlgs/makefile.mk.old 2009-04-06 16:41:39.000000000 +0000
-+++ sc/source/ui/miscdlgs/makefile.mk 2009-04-06 16:41:48.000000000 +0000
+--- sc/source/ui/miscdlgs/makefile.mk
++++ sc/source/ui/miscdlgs/makefile.mk
@@ -117,7 +117,9 @@ LIB1OBJFILES = \
- $(SLO)$/redcom.obj \
- $(SLO)$/warnbox.obj \
$(SLO)$/conflictsdlg.obj \
-- $(SLO)$/sharedocdlg.obj
-+ $(SLO)$/sharedocdlg.obj \
+ $(SLO)$/sharedocdlg.obj \
+ $(SLO)$/protectiondlg.obj \
+- $(SLO)$/retypepassdlg.obj
++ $(SLO)$/retypepassdlg.obj \
+ $(SLO)$/scuiautofmt.obj \
+ $(SLO)$/strindlg.obj
- # --- Tagets -------------------------------------------------------
-
+ EXCEPTIONSFILES = \
+ $(SLO)$/acredlin.obj \
--- sc/source/ui/src/popup.src.old 2009-04-02 10:45:23.000000000 +0000
+++ sc/source/ui/src/popup.src 2009-04-06 16:41:48.000000000 +0000
@@ -206,6 +206,84 @@ Menu RID_POPUP_PIVOT
commit 9aa6c6b32cb0267839d0430a95f2ed615961ac08
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 18:57:01 2009 +0300
sc-datapilot-dynamic-range.diff is in upstream.
* patches/dev300/sc-datapilot-dynamic-range.diff: Delete.
* patches/dev300/apply: Remove it from here.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 89d2dd8..8c72dff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -600,10 +600,6 @@ sc-autofilter-empty-nonempty.diff, i#35578, jody
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff, jody
-# Support modification of data source range in DataPilot after table output has
-# been generated.
-sc-datapilot-dynamic-range.diff, i#23658, kohei
-
# Provision for data-pilot to give autoformat bxc #62162
#
# Upstream has already rejected this patch, and closed the issue as WONTFIX.
diff --git a/patches/dev300/sc-datapilot-dynamic-range.diff b/patches/dev300/sc-datapilot-dynamic-range.diff
deleted file mode 100644
index 6f5b6d3..0000000
--- a/patches/dev300/sc-datapilot-dynamic-range.diff
+++ /dev/null
@@ -1,560 +0,0 @@
-diff --git sc/source/ui/dbgui/fieldwnd.cxx sc/source/ui/dbgui/fieldwnd.cxx
-index 10d3da7..979ba53 100644
---- sc/source/ui/dbgui/fieldwnd.cxx
-+++ sc/source/ui/dbgui/fieldwnd.cxx
-@@ -629,7 +629,7 @@ void ScDPFieldWindow::DelField( size_t nDelIndex )
-
- void ScDPFieldWindow::ClearFields()
- {
-- if( eType == TYPE_SELECT )
-+ if( eType == TYPE_SELECT || eType == TYPE_PAGE || eType == TYPE_COL || eType == TYPE_ROW || eType == TYPE_DATA)
- {
- com::sun::star::uno::Reference < com::sun::star::accessibility::XAccessible > xTempAcc = xAccessible;
- if (!xTempAcc.is() && pAccessible)
-diff --git sc/source/ui/dbgui/pivot.hrc sc/source/ui/dbgui/pivot.hrc
-index 4dea022..d142eb3 100644
---- sc/source/ui/dbgui/pivot.hrc
-+++ sc/source/ui/dbgui/pivot.hrc
-@@ -66,6 +66,10 @@
- #define BTN_FILTER 29
- #define BTN_DRILLDOWN 30
-
-+#define FT_INAREA 40
-+#define RB_INAREA 41
-+#define ED_INAREA 42
-+
- #define PIVOTSTR_SUM 1
- #define PIVOTSTR_COUNT 2
- #define PIVOTSTR_AVG 3
-diff --git sc/source/ui/dbgui/pivot.src sc/source/ui/dbgui/pivot.src
-index 78d5cf0..324cc37 100644
---- sc/source/ui/dbgui/pivot.src
-+++ sc/source/ui/dbgui/pivot.src
-@@ -158,7 +158,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- MapUnit = MAP_APPFONT ;
-- Delta = 73 ;
-+ Delta = 90 ;
- };
- Window WND_FIELD
- {
-@@ -178,17 +178,42 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- Text [ en-US ] = "Result" ;
- Hide = TRUE ;
- };
-- FixedText FT_OUTAREA
-+
-+ FixedText FT_INAREA
- {
- Pos = MAP_APPFONT ( 12 , 203 ) ;
- Size = MAP_APPFONT ( 59 , 8 ) ;
- Hide = TRUE ;
-+ Text [ en-US ] = "Selection from" ;
-+ };
-+ Edit ED_INAREA
-+ {
-+ Border = TRUE ;
-+ Pos = MAP_APPFONT ( 73 , 201 ) ;
-+ Size = MAP_APPFONT ( 100 , 12 ) ;
-+ TabStop = TRUE ;
-+ Hide = TRUE ;
-+ };
-+ ImageButton RB_INAREA
-+ {
-+ Pos = MAP_APPFONT ( 177 , 200 ) ;
-+ Size = MAP_APPFONT ( 13 , 15 ) ;
-+ TabStop = TRUE ;
-+ Hide = TRUE ;
-+ QuickHelpText [ en-US ] = "Shrink" ;
-+ };
-+
-+ FixedText FT_OUTAREA
-+ {
-+ Pos = MAP_APPFONT ( 12 , 221 ) ;
-+ Size = MAP_APPFONT ( 59 , 8 ) ;
-+ Hide = TRUE ;
- Text [ en-US ] = "Results to" ;
- };
- ListBox LB_OUTAREA
- {
- Border = TRUE ;
-- Pos = MAP_APPFONT ( 73 , 201 ) ;
-+ Pos = MAP_APPFONT ( 73 , 219 ) ;
- Size = MAP_APPFONT ( 75 , 90 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
-@@ -197,14 +222,14 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- Edit ED_OUTAREA
- {
- Border = TRUE ;
-- Pos = MAP_APPFONT ( 152 , 201 ) ;
-+ Pos = MAP_APPFONT ( 152 , 219 ) ;
- Size = MAP_APPFONT ( 100 , 12 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
- };
- ImageButton RB_OUTAREA
- {
-- Pos = MAP_APPFONT ( 256 , 200 ) ;
-+ Pos = MAP_APPFONT ( 256 , 218 ) ;
- Size = MAP_APPFONT ( 13 , 15 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-@@ -212,7 +237,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- };
- CheckBox BTN_IGNEMPTYROWS
- {
-- Pos = MAP_APPFONT ( 12 , 219 ) ;
-+ Pos = MAP_APPFONT ( 12 , 237 ) ;
- Size = MAP_APPFONT ( 124 , 10 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-@@ -220,7 +245,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- };
- CheckBox BTN_DETECTCAT
- {
-- Pos = MAP_APPFONT ( 142 , 219 ) ;
-+ Pos = MAP_APPFONT ( 142 , 237 ) ;
- Size = MAP_APPFONT ( 124 , 10 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-@@ -228,7 +253,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- };
- CheckBox BTN_TOTALCOL
- {
-- Pos = MAP_APPFONT ( 12 , 233 ) ;
-+ Pos = MAP_APPFONT ( 12 , 251 ) ;
- Size = MAP_APPFONT ( 124 , 10 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-@@ -236,7 +261,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- };
- CheckBox BTN_TOTALROW
- {
-- Pos = MAP_APPFONT ( 142 , 233 ) ;
-+ Pos = MAP_APPFONT ( 142 , 251 ) ;
- Size = MAP_APPFONT ( 124 , 10 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-@@ -244,7 +269,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- };
- CheckBox BTN_FILTER
- {
-- Pos = MAP_APPFONT ( 12 , 247 ) ;
-+ Pos = MAP_APPFONT ( 12 , 265 ) ;
- Size = MAP_APPFONT ( 124 , 10 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-@@ -252,7 +277,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT
- };
- CheckBox BTN_DRILLDOWN
- {
-- Pos = MAP_APPFONT ( 142 , 247 ) ;
-+ Pos = MAP_APPFONT ( 142 , 265 ) ;
- Size = MAP_APPFONT ( 124 , 10 ) ;
- TabStop = TRUE ;
- Hide = TRUE ;
-diff --git sc/source/ui/dbgui/pvlaydlg.cxx sc/source/ui/dbgui/pvlaydlg.cxx
-index fe48844..ecfa087 100644
---- sc/source/ui/dbgui/pvlaydlg.cxx
-+++ sc/source/ui/dbgui/pvlaydlg.cxx
-@@ -36,6 +36,7 @@
- //----------------------------------------------------------------------------
-
- #include "pvlaydlg.hxx"
-+#include "dbdocfun.hxx"
-
- #include <sfx2/dispatch.hxx>
- #include <vcl/msgbox.hxx>
-@@ -56,6 +57,7 @@
- #include "pivot.hrc"
- #include "dpobject.hxx"
- #include "dpsave.hxx"
-+#include "dpshttab.hxx"
- #include "scmod.hxx"
-
- #include "sc.hrc" //CHINA001
-@@ -120,6 +122,11 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
- aFtInfo ( this, ScResId( FT_INFO ) ),
-
- aFlAreas ( this, ScResId( FL_OUTPUT ) ),
-+
-+ aFtInArea ( this, ScResId( FT_INAREA) ),
-+ aEdInPos ( this, ScResId( ED_INAREA) ),
-+ aRbInPos ( this, ScResId( RB_INAREA ), &aEdInPos, this ),
-+
- aLbOutPos ( this, ScResId( LB_OUTAREA ) ),
- aFtOutArea ( this, ScResId( FT_OUTAREA ) ),
- aEdOutPos ( this, this, ScResId( ED_OUTAREA ) ),
-@@ -143,6 +150,8 @@ ScDPLayoutDlg::ScDPLayoutDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pPar
-
- bIsDrag ( FALSE ),
-
-+ pEditActive ( NULL ),
-+
- eLastActiveType ( TYPE_SELECT ),
- nOffset ( 0 ),
- //
-@@ -204,6 +213,10 @@ void __EXPORT ScDPLayoutDlg::Init()
- for ( USHORT i = 0; i < FUNC_COUNT; ++i )
- aFuncNameArr.push_back( String( ScResId( i + 1 ) ) );
-
-+ aBtnMore.AddWindow( &aFlAreas );
-+ aBtnMore.AddWindow( &aFtInArea );
-+ aBtnMore.AddWindow( &aEdInPos );
-+ aBtnMore.AddWindow( &aRbInPos );
- aBtnMore.AddWindow( &aFtOutArea );
- aBtnMore.AddWindow( &aLbOutPos );
- aBtnMore.AddWindow( &aEdOutPos );
-@@ -214,7 +227,6 @@ void __EXPORT ScDPLayoutDlg::Init()
- aBtnMore.AddWindow( &aBtnTotalRow );
- aBtnMore.AddWindow( &aBtnFilter );
- aBtnMore.AddWindow( &aBtnDrillDown );
-- aBtnMore.AddWindow( &aFlAreas );
- aBtnMore.SetClickHdl( LINK( this, ScDPLayoutDlg, MoreClickHdl ) );
-
- {
-@@ -232,31 +244,35 @@ void __EXPORT ScDPLayoutDlg::Init()
- aRowArr.resize( MAX_FIELDS );
- aDataArr.resize( MAX_FIELDS );
-
-- InitWndSelect( thePivotData.ppLabelArr, static_cast<long>(thePivotData.nLabels) );
-- InitWnd( thePivotData.aPageArr, static_cast<long>(thePivotData.nPageCount), TYPE_PAGE );
-- InitWnd( thePivotData.aColArr, static_cast<long>(thePivotData.nColCount), TYPE_COL );
-- InitWnd( thePivotData.aRowArr, static_cast<long>(thePivotData.nRowCount), TYPE_ROW );
-- InitWnd( thePivotData.aDataArr, static_cast<long>(thePivotData.nDataCount), TYPE_DATA );
--
-- aSlider.SetPageSize( PAGE_SIZE );
-- aSlider.SetVisibleSize( PAGE_SIZE );
-- aSlider.SetLineSize( LINE_SIZE );
-- aSlider.SetRange( Range( 0, static_cast<long>(((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
--
-- if ( thePivotData.nLabels > PAGE_SIZE )
-+ ScRange inRange;
-+ String inString;
-+ if (xDlgDPObject->GetSheetDesc())
- {
-- aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
-- aSlider.Show();
-+ aEdInPos.Enable();
-+ aRbInPos.Enable();
-+ aOldRange = xDlgDPObject->GetSheetDesc()->aSourceRange;
-+ aOldRange.Format( inString, SCR_ABS_3D, pDoc, pDoc->GetAddressConvention() );
-+ aEdInPos.SetText(inString);
- }
- else
-- aSlider.Hide();
-+ {
-+ /* Data is not reachable, so could be a remote database */
-+ aEdInPos.Disable();
-+ aRbInPos.Disable();
-+ }
-
-- // Ein-/Ausgabebereiche: ----------------------------------------------
-+ InitFields();
-
- aLbOutPos .SetSelectHdl( LINK( this, ScDPLayoutDlg, SelAreaHdl ) );
- aEdOutPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdModifyHdl ) );
-+ aEdInPos .SetModifyHdl( LINK( this, ScDPLayoutDlg, EdInModifyHdl ) );
- aBtnOk .SetClickHdl ( LINK( this, ScDPLayoutDlg, OkHdl ) );
- aBtnCancel.SetClickHdl ( LINK( this, ScDPLayoutDlg, CancelHdl ) );
-+ Link aLink = LINK( this, ScDPLayoutDlg, GetFocusHdl );
-+ if ( aEdInPos.IsEnabled() )
-+ // Once disabled it will never get enabled, so no need to handle focus.
-+ aEdInPos.SetGetFocusHdl( aLink );
-+ aEdOutPos.SetGetFocusHdl( aLink );
-
- if ( pViewData && pDoc )
- {
-@@ -475,6 +491,27 @@ void ScDPLayoutDlg::InitFocus()
- aWndSelect.GrabFocus();
- }
-
-+void ScDPLayoutDlg::InitFields()
-+{
-+ InitWndSelect( thePivotData.ppLabelArr, static_cast<long>(thePivotData.nLabels) );
-+ InitWnd( thePivotData.aPageArr, static_cast<long>(thePivotData.nPageCount), TYPE_PAGE );
-+ InitWnd( thePivotData.aColArr, static_cast<long>(thePivotData.nColCount), TYPE_COL );
-+ InitWnd( thePivotData.aRowArr, static_cast<long>(thePivotData.nRowCount), TYPE_ROW );
-+ InitWnd( thePivotData.aDataArr, static_cast<long>(thePivotData.nDataCount), TYPE_DATA );
-+
-+ aSlider.SetPageSize( PAGE_SIZE );
-+ aSlider.SetVisibleSize( PAGE_SIZE );
-+ aSlider.SetLineSize( LINE_SIZE );
-+ aSlider.SetRange( Range( 0, static_cast<long>(((thePivotData.nLabels+LINE_SIZE-1)/LINE_SIZE)*LINE_SIZE) ) );
-+
-+ if ( thePivotData.nLabels > PAGE_SIZE )
-+ {
-+ aSlider.SetEndScrollHdl( LINK( this, ScDPLayoutDlg, ScrollHdl ) );
-+ aSlider.Show();
-+ }
-+ else
-+ aSlider.Hide();
-+}
-
- //----------------------------------------------------------------------------
-
-@@ -1309,23 +1346,76 @@ BOOL ScDPLayoutDlg::GetPivotArrays( PivotField* pPageArr,
- return bFit;
- }
-
-+void ScDPLayoutDlg::UpdateSrcRange()
-+{
-+ String theCurPosStr = aEdInPos.GetText();
-+ USHORT nResult = ScRange().Parse(theCurPosStr, pDoc, pDoc->GetAddressConvention());
-+
-+ if ( SCA_VALID != (nResult & SCA_VALID) )
-+ // invalid source range.
-+ return;
-+
-+ ScRefAddress start, end;
-+ ConvertDoubleRef(pDoc, theCurPosStr, 1, start, end, pDoc->GetAddressConvention());
-+ ScRange aNewRange(start.GetAddress(), end.GetAddress());
-+ ScSheetSourceDesc inSheet = *xDlgDPObject->GetSheetDesc();
-+
-+ if (inSheet.aSourceRange == aNewRange)
-+ // new range is identical to the current range. Nothing to do.
-+ return;
-+
-+ ScTabViewShell * pTabViewShell = pViewData->GetViewShell();
-+ inSheet.aSourceRange = aNewRange;
-+ xDlgDPObject->SetSheetDesc(inSheet);
-+ xDlgDPObject->FillOldParam( thePivotData, FALSE );
-+ xDlgDPObject->FillLabelData(thePivotData);
-+
-+ pTabViewShell->SetDialogDPObject(xDlgDPObject.get());
-+ aLabelDataArr.clear();
-+ aWndSelect.ClearFields();
-+ aWndData.ClearFields();
-+ aWndRow.ClearFields();
-+ aWndCol.ClearFields();
-+ aWndPage.ClearFields();
-+
-+ for (size_t i = 0; i < MAX_LABELS; ++i)
-+ aSelectArr[i].reset();
-+
-+ for (size_t i = 0; i < MAX_FIELDS; ++i)
-+ {
-+ aRowArr[i].reset();
-+ aColArr[i].reset();
-+ aDataArr[i].reset();
-+ }
-+
-+ for (size_t i = 0; i < MAX_PAGEFIELDS; ++i)
-+ aPageArr[i].reset();
-+
-+ InitFields();
-+}
-
- //----------------------------------------------------------------------------
-
- void ScDPLayoutDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
- {
-- if ( bRefInputMode )
-- {
-- if ( rRef.aStart != rRef.aEnd )
-- RefInputStart( &aEdOutPos );
--/*
-- ScAddress aAdr( nStartCol, nStartRow, nStartTab );
-- aAdr.PutInOrder( ScAddress( nEndCol, nEndRow, nEndTab ) );
--*/
-- String aRefStr;
-+ if ( !bRefInputMode || !pEditActive )
-+ return;
-+
-+ if ( rRef.aStart != rRef.aEnd )
-+ RefInputStart( pEditActive );
-+
-+ if ( pEditActive == &aEdInPos )
-+ {
-+ String aRefStr;
-+ rRef.Format( aRefStr, SCR_ABS_3D, pDocP, pDocP->GetAddressConvention() );
-+ pEditActive->SetRefString( aRefStr );
-+ }
-+ else if ( pEditActive == &aEdOutPos )
-+ {
-+ String aRefStr;
- rRef.aStart.Format( aRefStr, STD_FORMAT, pDocP, pDocP->GetAddressConvention() );
-- aEdOutPos.SetRefString( aRefStr );
-- }
-+ pEditActive->SetRefString( aRefStr );
-+ }
- }
-
-
-@@ -1335,7 +1426,12 @@ void ScDPLayoutDlg::SetActive()
- {
- if ( bRefInputMode )
- {
-- aEdOutPos.GrabFocus();
-+ if ( pEditActive )
-+ pEditActive->GrabFocus();
-+
-+ if ( pEditActive == &aEdInPos )
-+ EdInModifyHdl( NULL );
-+ else if ( pEditActive == &aEdOutPos )
- EdModifyHdl( NULL );
- }
- else
-@@ -1374,7 +1470,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
- String aOutPosStr( aEdOutPos.GetText() );
- ScAddress aAdrDest;
- BOOL bToNewTable = (aLbOutPos.GetSelectEntryPos() == 1);
-- USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc ) : 0;
-+ USHORT nResult = !bToNewTable ? aAdrDest.Parse( aOutPosStr, pDoc, pDoc->GetAddressConvention() ) : 0;
-
- if ( bToNewTable
- || ( (aOutPosStr.Len() > 0) && (SCA_VALID == (nResult & SCA_VALID)) ) )
-@@ -1507,12 +1603,11 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG )
-
- //----------------------------------------------------------------------------
-
--IMPL_LINK_INLINE_START( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG )
-+IMPL_LINK( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG )
- {
- Close();
- return 0;
- }
--IMPL_LINK_INLINE_END( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG )
-
-
- //----------------------------------------------------------------------------
-@@ -1524,9 +1619,18 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
- bRefInputMode = TRUE;
- //@BugID 54702 Enablen/Disablen nur noch in Basisklasse
- //SFX_APPWINDOW->Enable();
-+ if ( aEdInPos.IsEnabled() )
-+ {
-+ aEdInPos.Enable();
-+ aEdInPos.GrabFocus();
-+ aEdInPos.Enable();
-+ }
-+ else
-+ {
- aEdOutPos.Enable();
- aEdOutPos.GrabFocus();
-- aRbOutPos.Enable();
-+ aEdOutPos.Enable();
-+ }
- }
- else
- {
-@@ -1543,7 +1647,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG )
- IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG )
- {
- String theCurPosStr = aEdOutPos.GetText();
-- USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc );
-+ USHORT nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
-
- if ( SCA_VALID == (nResult & SCA_VALID) )
- {
-@@ -1567,6 +1671,13 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG )
- }
-
-
-+IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG )
-+{
-+ UpdateSrcRange();
-+ return 0;
-+}
-+
-+
- //----------------------------------------------------------------------------
-
- IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG )
-@@ -1620,4 +1731,16 @@ IMPL_LINK( ScDPLayoutDlg, ScrollHdl, ScrollBar *, EMPTYARG )
- return 0;
- }
-
-+//----------------------------------------------------------------------------
-+
-+IMPL_LINK( ScDPLayoutDlg, GetFocusHdl, Control*, pCtrl )
-+{
-+ pEditActive = NULL;
-+ if ( pCtrl == &aEdInPos )
-+ pEditActive = &aEdInPos;
-+ else if ( pCtrl == &aEdOutPos )
-+ pEditActive = &aEdOutPos;
-+
-+ return 0;
-+}
-
-diff --git sc/source/ui/inc/pvlaydlg.hxx sc/source/ui/inc/pvlaydlg.hxx
-index 1f6f132..3455375 100644
---- sc/source/ui/inc/pvlaydlg.hxx
-+++ sc/source/ui/inc/pvlaydlg.hxx
-@@ -48,6 +48,7 @@
- #include "pivot.hxx"
- #include "anyrefdg.hxx"
- #include "fieldwnd.hxx"
-+#include "formula/funcutl.hxx"
-
- /*==========================================================================*\
-
-@@ -129,10 +130,18 @@ private:
- FixedInfo aFtInfo;
-
- FixedLine aFlAreas;
-+
-+ // DP source selection
-+ FixedText aFtInArea;
-+ ::formula::RefEdit aEdInPos;
-+ ::formula::RefButton aRbInPos;
-+
-+ // DP output location
- ListBox aLbOutPos;
- FixedText aFtOutArea;
-- formula::RefEdit aEdOutPos;
-- formula::RefButton aRbOutPos;
-+ formula::RefEdit aEdOutPos;
-+ formula::RefButton aRbOutPos;
-+
- CheckBox aBtnIgnEmptyRows;
- CheckBox aBtnDetectCat;
- CheckBox aBtnTotalCol;
-@@ -155,6 +164,8 @@ private:
- size_t nDnDFromIndex;
- BOOL bIsDrag;
-
-+ ::formula::RefEdit* pEditActive;
-+
- Rectangle aRectPage;
- Rectangle aRectRow;
- Rectangle aRectCol;
-@@ -173,6 +184,7 @@ private:
- ScDPFuncDataVec aDataArr;
-
- ScDPObjectPtr xDlgDPObject;
-+ ScRange aOldRange;
- ScPivotParam thePivotData;
- ScViewData* pViewData;
- ScDocument* pDoc;
-@@ -184,6 +196,7 @@ private:
- void InitWndSelect ( LabelData** ppLabelArr, long nLabels );
- void InitWnd ( PivotField* pArr, long nCount, ScDPFieldType eType );
- void InitFocus ();
-+ void InitFields ();
- void CalcWndSizes ();
- Point DlgPos2WndPos ( const Point& rPt, Window& rWnd );
- ScDPLabelData* GetLabelData ( SCsCOL nCol, size_t* pPos = NULL );
-@@ -207,14 +220,19 @@ private:
- USHORT& rColCount,
- USHORT& rRowCount,
- USHORT& rDataCount );
-+
-+ void UpdateSrcRange();
-+
- // Handler
- DECL_LINK( ClickHdl, PushButton * );
- DECL_LINK( ScrollHdl, ScrollBar * );
- DECL_LINK( SelAreaHdl, ListBox * );
- DECL_LINK( MoreClickHdl, MoreButton * );
- DECL_LINK( EdModifyHdl, Edit * );
-+ DECL_LINK( EdInModifyHdl, Edit * );
- DECL_LINK( OkHdl, OKButton * );
- DECL_LINK( CancelHdl, CancelButton * );
-+ DECL_LINK( GetFocusHdl, Control* );
- };
-
-
commit a9b56f457be4fd7aa3ddb7309af21af86fd8673c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 18:40:41 2009 +0300
s/UnUsedButNotYetRemovedFromSVN/UnUsedButNotYetRemovedFromGit
* patches/dev300/apply: Rename the UnUsedButNotYetRemovedFromSVN set
to UnUsedButNotYetRemovedFromGit to reflect reality.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index aac8f59..89d2dd8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -30,7 +30,7 @@ Win32Common : Common, Defaults, TangoIcons, \
Win32Only, NotDebian
# Experimental sections
Experimental: VBAUntested, ArkOnlyExperimental, \
- UnUsedButNotYetRemovedFromSVN, WebDAVUpstream, \
+ UnUsedButNotYetRemovedFromGit, WebDAVUpstream, \
PostgreSQL, SELinux, VOSremoval, Glib2, \
UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
KDE4Experimental, MinGW, CalcExperimental, Mono24, \
@@ -2260,7 +2260,7 @@ pardus-clipart.diff
no-mozilla-plug-in-option.diff
dont-check-fqdn.diff
-[ UnUsedButNotYetRemovedFromSVN ]
+[ UnUsedButNotYetRemovedFromGit ]
# diffs kept for reference as there might soon be a need to resurrect
# part of the code
win32-quickstarter-exit.diff, i#73550, tml
commit 6fbb574416ef732c959fd6b6096ca3f170f77dae
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 17:40:25 2009 +0300
sc-standard-filter-options-ods-hack.diff is unneeded.
* patches/dev300/apply: Move sc-standard-filter-options-ods-hack.diff
to UnUsedButNotYetRemovedFromSVN, too. Upstream has the functionality
albeit implemented slightly differently.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 53276e3..aac8f59 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -594,9 +594,6 @@ gcc4-visibility-sc.diff, i#53261, pmladek
# adds to Autofilter Empty-NonEmpty options bxc #62165
sc-autofilter-empty-nonempty.diff, i#35578, jody
-# Saves and loads the standard filters in ods
-sc-standard-filter-options-ods-hack.diff, i#35579, jonp
-
# Hides the filtered rows when height of rows are changed bxc #62161
# sc-filter-hide-filteredrows.diff, i#35581, jody
@@ -2281,6 +2278,9 @@ sw-mailmerge-faster.diff, i#40827, mloiseleur
# Improves the standard filter options and menu. bxc #62187 #62495
sc-standard-filter-options.diff, i#35579, michael
+# Saves and loads the standard filters in ods
+sc-standard-filter-options-ods-hack.diff, i#35579, jonp
+
[ Store ]
SectionOwner => rodo
commit a56607f5b31ffe7eef3fa9a20e6c9e683f88e8c4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 17:28:00 2009 +0300
sc-standard-filter-options.diff is apparently unneeded.
* patches/dev300/apply: The issue which
sc-standard-filter-options.diff fixes has been resolved. (Using
different code.) So presumably that patch is not needed any
more. Moved to UnUsedButNotYetRemovedFromSVN.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 46a539e..53276e3 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -594,9 +594,6 @@ gcc4-visibility-sc.diff, i#53261, pmladek
# adds to Autofilter Empty-NonEmpty options bxc #62165
sc-autofilter-empty-nonempty.diff, i#35578, jody
-# Improves the standard filter options and menu. bxc #62187 #62495
-sc-standard-filter-options.diff, i#35579, michael
-
# Saves and loads the standard filters in ods
sc-standard-filter-options-ods-hack.diff, i#35579, jonp
@@ -2281,6 +2278,9 @@ cws-commit-patch-default-dev300.diff, i#87431, jholesov
# Provides a great speed-up for a mail merge operation : 7x faster
sw-mailmerge-faster.diff, i#40827, mloiseleur
+# Improves the standard filter options and menu. bxc #62187 #62495
+sc-standard-filter-options.diff, i#35579, michael
+
[ Store ]
SectionOwner => rodo
commit cbc69a8f6fe88de67381566a9d2c3158680e2150
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 17:23:00 2009 +0300
Adapt zoom-combobox.diff for dev300-m54.
* patches/dev300/zoom-combobox.diff: Adapt patch to helpid.hrc for
dev300-m54.
diff --git a/patches/dev300/zoom-combobox.diff b/patches/dev300/zoom-combobox.diff
index 8bde39f..2229312 100644
--- a/patches/dev300/zoom-combobox.diff
+++ b/patches/dev300/zoom-combobox.diff
@@ -93,21 +93,20 @@ diff --git svx/inc/helpid.hrc svx/inc/helpid.hrc
index b28d7c8..fb5d6ab 100644
--- svx/inc/helpid.hrc
+++ svx/inc/helpid.hrc
-@@ -809,6 +809,8 @@
+@@ -809,6 +809,7 @@
+ #define HID_MACRO_MACROS (HID_SVX_EXT0_START + 215)
+ #define HID_MACROCHECKDIALOG (HID_SVX_EXT0_START + 216)
+ #define HID_MACRO_HEADERTABLISTBOX (HID_SVX_EXT0_START + 217)
++#define HID_ZOOM_COMBOBOX (HID_SVX_EXT0_START + 218)
- #define HID_NUMBERFORMAT_WND_NUMBER_PREVIEW (HID_SVX_EXT0_START + 207)
- #define HID_SPLDLG_BUTTON_IGNORERULE (HID_SVX_EXT0_START + 208)
-+#define HID_ZOOM_COMBOBOX (HID_SVX_EXT0_START + 209)
-+
// please adjust ACT_SVX_HID_END2 below if you add entries here!
- // -----------------------------------------------------------------------
@@ -820,7 +822,7 @@
#error Resource-Ueberlauf in #line, #file
#endif
--#define ACT_SVX_HID_END2 HID_SPLDLG_BUTTON_IGNORERULE
-+#define ACT_SVX_HID_END2 HID_ZOOM_COMBOBOX
+-#define ACT_SVX_HID_END2 (HID_SVX_EXT0_START + 215)
++#define ACT_SVX_HID_END2 (HID_SVX_EXT0_START + 218)
#if ACT_SVX_HID_END2 > HID_SVX_EXT0_END
#error resource overrun in #line, #file
#endif
commit 414b0b891d838b788e7983a349b63ec1da61d3b0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 16:21:10 2009 +0300
sw-mailmerge-faster.diff presumably is unnecessary.
* patches/dev300/apply: sw-mailmerge-faster.diff doesn't apply in
dev300-m54. Move to UnUsedButNotYetRemovedFromSVN. The affected code
has changed quite a bit, and the related issue is marked to be fixed
and verified, so presumably the patch is not needed any more.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index ae754ff..46a539e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -577,11 +577,6 @@ sw-html-insert-unknown-tags.diff, i#59064, mloiseleur
# Allows to edit a csv data source after a mail merge
sw-remove-csv-lock.diff, i#85133, mloiseleur
-[ WriterFixes ]
-# Provides a great speed-up for a mail merge operation : 7x faster
-sw-mailmerge-faster.diff, i#40827, mloiseleur
-
-
[ CalcFixes ]
# To make CSV Text Import settings persistent, and also allow importing of
# quoted fields as text.
@@ -2283,6 +2278,9 @@ cygwin-make-ver.diff, i#68283, michael
# default to DEV300 in cws-commit-patch
cws-commit-patch-default-dev300.diff, i#87431, jholesov
+# Provides a great speed-up for a mail merge operation : 7x faster
+sw-mailmerge-faster.diff, i#40827, mloiseleur
+
[ Store ]
SectionOwner => rodo
commit 08a51abc5f0aa5ae6da2c70b52d851b9407d397b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 16:15:48 2009 +0300
Update webdav-locking-from-ooo-build-2-4-1.diff for dev300-m54.
* patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff: Adapt so it
applies to dev300-m54. No idea whether actually works any longer,
though.
diff --git a/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff b/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
index 4d34939..4d5aff5 100644
--- a/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
+++ b/patches/dev300/webdav-locking-from-ooo-build-2-4-1.diff
@@ -73,10 +73,10 @@
SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item, SID_UPDATEDOCMODE, sal_False);
nCanUpdate = pUpdateDocItem ? pUpdateDocItem->GetValue() : com::sun::star::document::UpdateDocMode::NO_UPDATE;
---- sfx2/inc/sfx2/docfile.hxx.old 2009-04-02 10:44:03.000000000 +0000
-+++ sfx2/inc/sfx2/docfile.hxx 2009-04-06 16:41:46.000000000 +0000
+--- sfx2/inc/sfx2/docfile.hxx
++++ sfx2/inc/sfx2/docfile.hxx
@@ -186,7 +186,7 @@ public:
- ::com::sun::star::util::DateTime GetInitFileDate();
+ ::com::sun::star::util::DateTime GetInitFileDate( sal_Bool bIgnoreOldValue );
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > GetContent() const;
- const String& GetPhysicalName() const;
@@ -137,8 +137,8 @@
aShowSizeFT.SetText( aSizeText );
String aDescription = SvFileInformationManager::GetDescription( INetURLObject(rMainURL) );
---- sfx2/source/doc/docfile.cxx.old 2009-04-02 10:43:58.000000000 +0000
-+++ sfx2/source/doc/docfile.cxx 2009-04-06 16:41:46.000000000 +0000
+--- sfx2/source/doc/docfile.cxx
++++ sfx2/source/doc/docfile.cxx
@@ -749,10 +749,13 @@ sal_Bool SfxMedium::CloseOutStream_Impl(
}
@@ -156,8 +156,8 @@
// return the name then
return aName;
@@ -796,8 +799,6 @@ sal_Bool SfxMedium::Commit()
- GetInitFileDate();
- }
+ if ( bResult && DocNeedsFileDateCheck() )
+ GetInitFileDate( sal_True );
- // remove truncation mode from the flags
- nStorOpenMode &= (~STREAM_TRUNC);
@@ -597,8 +597,8 @@
: m_aRequestURI( rRequestURI ),
m_xAuthListener( xListener ),
m_aRequestHeaders( rRequestHeaders ),
---- ucb/source/ucp/webdav/DAVResourceAccess.cxx.old 2009-04-02 11:01:38.000000000 +0000
-+++ ucb/source/ucp/webdav/DAVResourceAccess.cxx 2009-04-06 16:41:46.000000000 +0000
+--- ucb/source/ucp/webdav/DAVResourceAccess.cxx
++++ ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -42,6 +42,9 @@
#include "DAVAuthListenerImpl.hxx"
#include "DAVResourceAccess.hxx"
@@ -609,9 +609,9 @@
using namespace webdav_ucp;
using namespace com::sun::star;
-@@ -61,56 +64,55 @@ int DAVAuthListener_Impl::authenticate(
- ::rtl::OUString & inoutUserName,
- ::rtl::OUString & outPassWord )
+@@ -61,58 +64,57 @@ int DAVAuthListener_Impl::authenticate(
+ ::rtl::OUString & outPassWord,
+ const sal_Bool & bAllowPersistentStoring)
{
- if ( m_xEnv.is() )
- {
@@ -631,7 +631,9 @@
- = new ucbhelper::SimpleAuthenticationRequest( inHostName,
- inRealm,
- inoutUserName,
-- outPassWord );
+- outPassWord,
+- ::rtl::OUString(),
+- bAllowPersistentStoring);
- xIH->handle( xRequest.get() );
+ uno::Reference< task::XInteractionHandler > xIH;
@@ -675,7 +677,9 @@
+ = new ucbhelper::SimpleAuthenticationRequest( inHostName,
+ inRealm,
+ inoutUserName,
-+ outPassWord );
++ outPassWord,
++ ::rtl::OUString(),
++ bAllowPersistentStoring );
+ xIH->handle( xRequest.get() );
+
+ rtl::Reference< ucbhelper::InteractionContinuation > xSelection
@@ -915,8 +919,8 @@
private:
const rtl::OUString & getRequestURI() const;
sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL )
---- ucb/source/ucp/webdav/DAVSession.hxx.old 2009-04-02 11:01:38.000000000 +0000
-+++ ucb/source/ucp/webdav/DAVSession.hxx 2009-04-06 16:41:46.000000000 +0000
+--- ucb/source/ucp/webdav/DAVSession.hxx
++++ ucb/source/ucp/webdav/DAVSession.hxx
@@ -33,8 +33,11 @@
#include <memory>
@@ -954,7 +958,7 @@
virtual void GET( const ::rtl::OUString & inPath,
@@ -134,6 +136,12 @@ public:
- const DAVRequestEnvironment & rEnv )
+ virtual void ABORT()
throw( DAVException ) = 0;
+ virtual void PUT( const ::rtl::OUString & inPath,
@@ -1878,8 +1882,8 @@
// -------------------------------------------------------------------
namespace {
---- ucb/source/ucp/webdav/NeonSession.hxx.old 2009-04-02 11:01:38.000000000 +0000
-+++ ucb/source/ucp/webdav/NeonSession.hxx 2009-04-06 16:41:46.000000000 +0000
+--- ucb/source/ucp/webdav/NeonSession.hxx
++++ ucb/source/ucp/webdav/NeonSession.hxx
@@ -57,6 +57,7 @@ class NeonSession : public DAVSession
rtl::OUString m_aScheme;
rtl::OUString m_aHostName;
@@ -1937,7 +1941,7 @@
com::sun::star::io::XInputStream >
POST( const rtl::OUString & inPath,
@@ -209,16 +219,13 @@ class NeonSession : public DAVSession
- const DAVRequestEnvironment & rEnv )
+ virtual void ABORT()
throw ( DAVException );
- // Note: Uncomment the following if locking support is required
commit ab46000770bbf4176009c5826bfe951424e0dda6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 16:03:30 2009 +0300
Update forms-radio-button-group-names.diff for dev300-m54.
* patches/dev300/forms-radio-button-group-names.diff: Update for
dev300-m54.
diff --git a/patches/dev300/forms-radio-button-group-names.diff b/patches/dev300/forms-radio-button-group-names.diff
index f6c15b8..30d1baa 100644
--- a/patches/dev300/forms-radio-button-group-names.diff
+++ b/patches/dev300/forms-radio-button-group-names.diff
@@ -3,13 +3,13 @@ index fe70aa3..c3dbd20 100644
--- extensions/inc/extensio.hrc
+++ extensions/inc/extensio.hrc
@@ -458,9 +458,10 @@
- #define HID_PROP_IMAGEPOSITION (HID_FORMS_START + 339)
#define HID_PROP_NOLABEL (HID_FORMS_START + 340)
#define HID_PROP_WRITING_MODE (HID_FORMS_START + 341)
-+#define HID_PROP_GROUP_NAME (HID_FORMS_START + 342)
+ #define HID_PROP_ANCHOR_TYPE (HID_FORMS_START + 343)
++#define HID_PROP_GROUP_NAME (HID_FORMS_START + 344)
// please adjust HID_LAST_FORMS_ID if you add new ids here!
--#define HID_LAST_FORMS_ID HID_PROP_WRITING_MODE
+-#define HID_LAST_FORMS_ID HID_PROP_ANCHOR_TYPE
+#define HID_LAST_FORMS_ID HID_PROP_GROUP_NAME
#if HID_LAST_FORMS_ID > HID_FORMS_END
@@ -57,12 +57,11 @@ diff --git extensions/source/propctrlr/formresid.hrc extensions/source/propctrlr
index a889086..aed2207 100644
--- extensions/source/propctrlr/formresid.hrc
+++ extensions/source/propctrlr/formresid.hrc
-@@ -150,7 +150,8 @@
- #define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 )
- #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
+@@ -150,6 +150,7 @@
#define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 )
-+#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 123 )
+ #define RID_STR_WHEEL_BEHAVIOR ( RID_FORMBROWSER_START + 123 )
++#define RID_STR_GROUP_NAME ( RID_FORMBROWSER_START + 124 )
// FREE
// FREE
// FREE
@@ -82,12 +81,14 @@ diff --git extensions/util/hidother.src extensions/util/hidother.src
index b075f8c..624ae37 100644
--- extensions/util/hidother.src
+++ extensions/util/hidother.src
-@@ -307,4 +307,5 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION { HelpId = HID_CHECK_FOR_UPD_DES
+@@ -307,6 +307,7 @@ hidspecial HID_CHECK_FOR_UPD_DESCRIPTION { HelpId = HID_CHECK_FOR_UPD_DES
hidspecial HID_CHECK_FOR_UPD_CANCEL { HelpId = HID_CHECK_FOR_UPD_CANCEL; }
hidspecial HID_PROP_NOLABEL { HelpId = HID_PROP_NOLABEL; }
hidspecial HID_PROP_INPUT_REQUIRED { HelpId = HID_PROP_INPUT_REQUIRED; }
+hidspecial HID_PROP_GROUP_NAME { HelpId = HID_PROP_GROUP_NAME; }
hidspecial HID_PROP_WRITING_MODE { HelpId = HID_PROP_WRITING_MODE; }
+ hidspecial HID_PROP_ENABLE_VISIBLE { HelpId = HID_PROP_ENABLE_VISIBLE; }
+ hidspecial HID_PROP_WHEEL_BEHAVIOR { HelpId = HID_PROP_WHEEL_BEHAVIOR; }
diff --git forms/source/component/GroupManager.cxx forms/source/component/GroupManager.cxx
index d831a82..f5a9ecb 100644
--- forms/source/component/GroupManager.cxx
@@ -722,8 +723,8 @@ index 11116de..e710a61 100644
--- xmloff/inc/xmloff/xmltoken.hxx
+++ xmloff/inc/xmloff/xmltoken.hxx
@@ -142,6 +142,10 @@ namespace xmloff { namespace token {
- XML_NP_RDFA,
- XML_N_RDFA,
+ XML_NP_GRDDL,
+ XML_N_GRDDL,
+ // jonp: 2008-09-24 Excel Interop
+ XML_NP_FORMX,
@@ -742,8 +743,8 @@ index 694df43..1dc010d 100644
mpNamespaceMap->Add( GetXMLToken(XML_NP_FIELD), GetXMLToken(XML_N_FIELD), XML_NAMESPACE_FIELD );
+ mpNamespaceMap->Add( GetXMLToken(XML_NP_FORMX), GetXMLToken(XML_N_FORMX), XML_NAMESPACE_FORMX );
}
- if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
- {
+ // RDFa: needed for content and header/footer styles
+ if( (getExportFlags() & (EXPORT_STYLES|EXPORT_AUTOSTYLES|EXPORT_MASTERSTYLES|EXPORT_CONTENT) ) != 0 )
diff --git xmloff/source/core/xmlimp.cxx xmloff/source/core/xmlimp.cxx
index e3b116c..a827e5b 100644
--- xmloff/source/core/xmlimp.cxx
@@ -771,8 +772,8 @@ index 8d66db2..24faf3d 100644
--- xmloff/source/core/xmltoken.cxx
+++ xmloff/source/core/xmltoken.cxx
@@ -150,6 +150,10 @@ namespace xmloff { namespace token {
- TOKEN( "rdfa", XML_NP_RDFA ),
- TOKEN( "http://docs.oasis-open.org/opendocument/meta/rdfa#", XML_N_RDFA ),
+ TOKEN( "grddl", XML_NP_GRDDL ),
+ TOKEN( "http://www.w3.org/2003/g/data-view#", XML_N_GRDDL ),
+ // jonp: 2008-09-24 Excel Interop
+ TOKEN( "formx", XML_NP_FORMX ),
commit 8451061d00be99b85e645f0c7597a79fd03109c5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 15:31:31 2009 +0300
Update svx-dialogs-resize.diff for dev300-m54.
* patches/dev300/svx-dialogs-resize.diff: Some src files have moved
from svx/source/dialog to svx/source/cui.
diff --git a/patches/dev300/svx-dialogs-resize.diff b/patches/dev300/svx-dialogs-resize.diff
index 8ce37d9..c26a1c0 100644
--- a/patches/dev300/svx-dialogs-resize.diff
+++ b/patches/dev300/svx-dialogs-resize.diff
@@ -1,5 +1,5 @@
---- svx/source/dialog/svuidlg.src.orig 2009-01-16 21:07:26.000000000 +0100
-+++ svx/source/dialog/svuidlg.src 2009-01-16 23:47:44.000000000 +0100
+--- svx/source/cui/svuidlg.src
++++ svx/source/cui/svuidlg.src
@@ -156,37 +156,37 @@
};
CancelButton 1
@@ -61,8 +61,8 @@
#define RIGHT 248
#define TOP 10
#define LINE(y) (14+y*15)
---- svx/source/dialog/zoom.src.orig 2009-01-16 21:32:37.000000000 +0100
-+++ svx/source/dialog/zoom.src 2009-01-16 23:53:36.000000000 +0100
+--- svx/source/cui/zoom.src
++++ svx/source/cui/zoom.src
@@ -55,7 +55,7 @@
RadioButton BTN_WHOLE_PAGE
{
@@ -83,8 +83,8 @@
#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
#define COL_2 (COL_1+RSC_SP_FLGR_SPACE_X)
---- svx/source/dialog/hangulhanjadlg.src.orig 2009-01-16 22:41:29.000000000 +0100
-+++ svx/source/dialog/hangulhanjadlg.src 2009-01-16 22:43:22.000000000 +0100
+--- svx/source/cui/hangulhanjadlg.src
++++ svx/source/cui/hangulhanjadlg.src
@@ -81,7 +81,7 @@
RadioButton RB_HANJA_HANGUL_BRACKETED
{
commit 565c11438fc427480714dc37635be46cb531c2c1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 15:28:49 2009 +0300
Update sw-dialogs-resize.diff for dev300-m54.
* patches/dev300/sw-dialogs-resize.diff: Update patch to
sw/source/ui/table/convert.src for dev300-m54.
diff --git a/patches/dev300/sw-dialogs-resize.diff b/patches/dev300/sw-dialogs-resize.diff
index b0fbd21..04945b2 100644
--- a/patches/dev300/sw-dialogs-resize.diff
+++ b/patches/dev300/sw-dialogs-resize.diff
@@ -4,8 +4,8 @@
{
HelpID = FN_CONVERT_TEXT_TABLE ;
OUTPUTSIZE = TRUE ;
-- Size = MAP_APPFONT ( 203 , 152 ) ;
-+ Size = MAP_APPFONT ( 223 , 152 ) ;
+- Size = MAP_APPFONT ( 203 , 169 ) ;
++ Size = MAP_APPFONT ( 223 , 169 ) ;
Text [ en-US ] = "Convert Table to Text" ;
MOVEABLE = TRUE ;
SVLOOK = TRUE ;
@@ -34,8 +34,8 @@
};
PushButton BT_AUTOFORMAT
{
- Pos = MAP_APPFONT ( 147 , 60 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Pos = MAP_APPFONT ( 12 , 152 ) ;
+- Size = MAP_APPFONT ( 66 , 14 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
TabStop = TRUE ;
Hide = TRUE ;
commit 630c6369d99a0fc2c3e140865ae0b87d0fb7b94c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 15:24:59 2009 +0300
i97329-sslwarndlg-truncation.diff is in dev300-m54.
* patches/dev300/i97329-sslwarndlg-truncation.diff: Delete.
* patches/dev300/apply: Remove it from here.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 943333e..ae754ff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -476,9 +476,6 @@ customunittext-percent.diff, i#80784, atimar
# make "Table Data View" and "Bibliography" localisable
i93000.diff, i#93000, atimar
-# fix truncated localized text on sslwarndlg in uui module
-i97329-sslwarndlg-truncation.diff, i#97329, atimar
-
# fix truncated localized text on several dialogs
# see http://wiki.services.openoffice.org/wiki/Hu.openoffice.org/QA_Screenshots
padmin-dialog-resize.diff, i#98164, atimar
diff --git a/patches/dev300/i97329-sslwarndlg-truncation.diff b/patches/dev300/i97329-sslwarndlg-truncation.diff
deleted file mode 100644
index f237219..0000000
--- a/patches/dev300/i97329-sslwarndlg-truncation.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naur uui/source.org/sslwarndlg.hrc uui/source/sslwarndlg.hrc
---- uui/source.org/sslwarndlg.hrc 2008-12-16 22:32:10.000000000 +0100
-+++ uui/source/sslwarndlg.hrc 2008-12-16 22:49:15.000000000 +0100
-@@ -43,7 +43,7 @@
-
- // Dims
-
--#define DLG_WIDTH 210
-+#define DLG_WIDTH 240
- #define DLG_HEIGHT 125
-
- #define DLG_WARMIMG_HEIGHT 20
-@@ -55,8 +55,9 @@
-
- #define DLG_CTLBTN_START_Y DLG_HEIGHT - RSC_SP_CTRL_X - RSC_CD_PUSHBUTTON_HEIGHT
-
--#define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 5
--#define DLG_CTLBTN_CANCEL_START_X DLG_WIDTH - 15 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH
-+#define DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 20
-+#define DLG_CTLBTN_CANCEL_START_X DLG_WIDTH - 45 - DLG_CTLBTN_CANCEL_PUSHBUTTON_WIDTH
- #define DLG_CTLBTN_OK_START_X DLG_CTLBTN_CANCEL_START_X - RSC_CD_PUSHBUTTON_WIDTH - RSC_SP_CTRL_GROUP_X
-+#define DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH RSC_CD_PUSHBUTTON_WIDTH + 25
- #define DLG_CTLBTN_CERT_START_X DLG_TEXT_START_X
- #endif //UUI_SSLWARN_HRC
-diff -Naur uui/source.org/sslwarndlg.src uui/source/sslwarndlg.src
---- uui/source.org/sslwarndlg.src 2008-12-16 22:32:10.000000000 +0100
-+++ uui/source/sslwarndlg.src 2008-12-16 22:44:46.000000000 +0100
-@@ -52,7 +52,7 @@
- FixedText FT_LABEL_1
- {
- Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP );
-- Size = MAP_APPFONT( 165, DLG_TEXT_1_HEIGHT );
-+ Size = MAP_APPFONT( 195, DLG_TEXT_1_HEIGHT );
-
- Text [ en-US ] = "No Text";
-
-@@ -63,7 +63,7 @@
- PushButton PB_VIEW__CERTIFICATE
- {
- Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y );
-- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-+ Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
-
- Text [ en-US ] = "View Certificate";
-
commit d15e2b9f1572605d38bc9accaaf7b5ce32dfe67c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 15:21:38 2009 +0300
shell-senddoc-library-path.diff is upstream.
* patches/dev300/shell-senddoc-library-path.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7f3c464..943333e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -476,12 +476,6 @@ customunittext-percent.diff, i#80784, atimar
# make "Table Data View" and "Bibliography" localisable
i93000.diff, i#93000, atimar
-# fix to work with groupwise
-# unset the LD_LIBRARY_PATH to do not confuse system mail clients with
-# OOo and Java libraries
-shell-senddoc-library-path.diff, i#95873, pmladek
-
-
# fix truncated localized text on sslwarndlg in uui module
i97329-sslwarndlg-truncation.diff, i#97329, atimar
diff --git a/patches/dev300/shell-senddoc-library-path.diff b/patches/dev300/shell-senddoc-library-path.diff
deleted file mode 100644
index 34e785d..0000000
--- a/patches/dev300/shell-senddoc-library-path.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- shell/source/unix/misc/senddoc.sh.old 2008-04-15 16:47:25.000000000 +0200
-+++ shell/source/unix/misc/senddoc.sh 2008-11-05 15:35:56.000000000 +0100
-@@ -8,6 +8,9 @@ then
- FOPTS="-L"
- fi
-
-+# do not confuse the system mail clients with OOo and Java libraries
-+unset LD_LIBRARY_PATH
-+
- # tries to locate the executable specified
- # as first parameter in the user's path.
- which() {
commit ce7608a9151e93accd4fb59cb3ed3bc2937511d0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 15:19:30 2009 +0300
Update for dev300-m54.
* patches/dev300/customunittext-percent.diff
* patches/dev300/customunittext-pixel.diff: Some src files have moved
from svx/source/dialog to svx/source/cui.
diff --git a/patches/dev300/customunittext-percent.diff b/patches/dev300/customunittext-percent.diff
index 1f282a6..f88e745 100644
--- a/patches/dev300/customunittext-percent.diff
+++ b/patches/dev300/customunittext-percent.diff
@@ -36,8 +36,8 @@
};
ListBox LB_4
{
---- svx/source/dialog/grfflt.src.orig 2008-03-23 15:10:04.250000000 +0100
-+++ svx/source/dialog/grfflt.src 2008-03-23 15:16:19.640625000 +0100
+--- svx/source/cui/grfflt.src
++++ svx/source/cui/grfflt.src
@@ -186,7 +186,7 @@
Maximum = 100 ;
StrictFormat = TRUE ;
@@ -56,8 +56,8 @@
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
---- svx/source/dialog/tabline.src.orig 2008-03-23 15:10:04.359375000 +0100
-+++ svx/source/dialog/tabline.src 2008-03-23 15:16:49.328125000 +0100
+--- svx/source/cui/tabline.src
++++ svx/source/cui/tabline.src
@@ -482,7 +482,7 @@
DecimalDigits = 2 ;
Value = 1 ;
diff --git a/patches/dev300/customunittext-pixel.diff b/patches/dev300/customunittext-pixel.diff
index 092b126..9b54a6c 100644
--- a/patches/dev300/customunittext-pixel.diff
+++ b/patches/dev300/customunittext-pixel.diff
@@ -18,8 +18,8 @@
};
FixedText FT_ORIGINAL
---- svx/source/dialog/grfflt.src.orig 2008-03-23 15:10:04.250000000 +0100
-+++ svx/source/dialog/grfflt.src 2008-03-23 15:16:19.640625000 +0100
+--- svx/source/cui/grfflt.src
++++ svx/source/cui/grfflt.src
@@ -83,7 +83,7 @@
Maximum = 999 ;
StrictFormat = TRUE ;
@@ -38,8 +38,8 @@
First = 1 ;
Last = 999 ;
SpinSize = 1 ;
---- svx/source/dialog/textanim.src.orig 2008-03-23 15:10:04.484375000 +0100
-+++ svx/source/dialog/textanim.src 2008-03-23 15:17:16.406250000 +0100
+--- svx/source/cui/textanim.src
++++ svx/source/cui/textanim.src
@@ -232,7 +232,7 @@
Spin = TRUE ;
StrictFormat = TRUE ;
commit 224de72c4aa83b53432d961129b4db90d8bf9f45
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 14:52:05 2009 +0300
import-controls-tooltip.diff is upstream.
* patches/dev300/import-controls-tooltip.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 93031b9..7f3c464 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -456,9 +456,6 @@ save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
localize-pl-cygwin-paths.diff, tml
-# import tooltip for userforms
-import-controls-tooltip.diff, i#90124, noelpwer
-
# fix path to the python binary in the mailmerge.py script
# /bin/python does not exists and breaks the automatic rpm dependencies
# FIXME 2008-11-26: the mailmerge.py in dev300-m35 doesn't have any #! line at all!?
diff --git a/patches/dev300/import-controls-tooltip.diff b/patches/dev300/import-controls-tooltip.diff
deleted file mode 100644
index 7e82af4..0000000
--- a/patches/dev300/import-controls-tooltip.diff
+++ /dev/null
@@ -1,60 +0,0 @@
---- /data4/OOOBuildM12/ooo-build/build/ooh680-m12/svx/inc/svx/msocximex.hxx 2008-04-02 12:14:58.000000000 +0100
-+++ svx/inc/svx/msocximex.hxx 2008-04-01 15:22:20.000000000 +0100
-@@ -298,6 +298,7 @@ public:
- sal_Int32 mnForeColor;
- sal_uInt16 mnTabPos;
- UniString sName;
-+ UniString msToolTip;
- OCX_FontData aFontData;
- SfxObjectShell *pDocSh;
- protected:
-@@ -908,7 +908,7 @@ public:
- sal_uInt8 nKeepScrollBarsVisible;
- sal_uInt8 nCycle;
- sal_uInt16 nBorderStyle;
-- sal_uInt16 nSpecialEffect;
-+ sal_uInt8 nSpecialEffect;
- sal_uInt16 nPicture;
- sal_uInt8 nPictureAlignment;
- sal_uInt8 nPictureSizeMode;
---- /data4/OOOBuildM12/ooo-build/build/ooh680-m12/svx/source/msfilter/msocximex.cxx 2008-04-02 15:01:33.000000000 +0100
-+++ svx/source/msfilter/msocximex.cxx 2008-04-02 14:49:08.000000000 +0100
-@@ -746,13 +746,16 @@ class ContainerRecReader
- ReadAlign( pS, pS->Tell() - nStartPos, 4 );
- *pS >> rec.nLeft >> rec.nTop;
- }
--
-+
- // control infotip
- sal_uInt32 nTipBufSize = lclGetBufferSize( nTipLen );
- if( nTipBufSize > 0 )
- {
-+ std::auto_ptr< sal_Char > pTipName;
-+ pTipName.reset( new sal_Char[ nTipBufSize ] );
- ReadAlign( pS, pS->Tell() - nStartPos, 4 );
-- pS->SeekRel( nTipBufSize );
-+ pS->Read( pTipName.get(), nTipBufSize );
-+ rec.controlTip = lclCreateOUString( pTipName.get(), nTipLen );
- }
- // control id
- sal_uInt32 nCntrlIdSize = lclGetBufferSize( nCntrlIdLen );
-@@ -1262,6 +1265,11 @@ sal_Bool OCX_Control::Import(uno::Refere
- xPropSet->setPropertyValue(WW8_ASCII2STR("Width"), aTmp);
- aTmp <<= sal_Int32((nHeight * 2) / 100);
- xPropSet->setPropertyValue(WW8_ASCII2STR("Height"), aTmp);
-+ if ( msToolTip.Len() > 0 )
-+ {
-+ uno::Any aTmp(&msToolTip,getCppuType((OUString *)0));
-+ xPropSet->setPropertyValue(WW8_ASCII2STR("HelpText"), aTmp);
-+ }
-
- if ( mnStep )
- {
-@@ -3664,6 +3666,7 @@ void OCX_ContainerControl::ProcessContro
- }
-
- pControl->sName = rec.cName;
-+ pControl->msToolTip = rec.controlTip;
- // Position of controls is relative to the container
- pControl->mnTop = rec.nTop + mnTop;
- pControl->mnLeft = rec.nLeft + mnLeft;
commit ca3e57131688e06a80e38d362409b4030ca13f2b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 14:49:03 2009 +0300
form-control-visibility.diff is upstream.
* patches/dev300/form-control-visibility.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d935283..93031b9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -456,9 +456,6 @@ save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
localize-pl-cygwin-paths.diff, tml
-# import/export form control's visibility
-form-control-visibility.diff, i#88878, noelpwer
-
# import tooltip for userforms
import-controls-tooltip.diff, i#90124, noelpwer
diff --git a/patches/dev300/form-control-visibility.diff b/patches/dev300/form-control-visibility.diff
deleted file mode 100644
index cffdf47..0000000
--- a/patches/dev300/form-control-visibility.diff
+++ /dev/null
@@ -1,934 +0,0 @@
-Index: xmloff/source/forms/formattributes.hxx
-===================================================================
---- xmloff/source/forms/formattributes.hxx (revision 271402)
-+++ xmloff/source/forms/formattributes.hxx (working copy)
-@@ -69,6 +69,7 @@
- #define CCA_VALUE 0x00200000
- #define CCA_ORIENTATION 0x00400000
- #define CCA_VISUAL_EFFECT 0x00800000
-+ #define CCA_ENABLEVISIBLE 0x01000000
-
- // flags for database control atttributes
- #define DA_BOUND_COLUMN 0x00000001
-Index: xmloff/source/forms/elementexport.cxx
-===================================================================
---- xmloff/source/forms/elementexport.cxx (revision 271402)
-+++ xmloff/source/forms/elementexport.cxx (working copy)
-@@ -529,15 +529,15 @@
- {
- static sal_Int32 nBooleanPropertyAttributeIds[] =
- { // attribute flags
-- CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP
-+ CCA_CURRENT_SELECTED, CCA_DISABLED, CCA_DROPDOWN, CCA_PRINTABLE, CCA_READONLY, CCA_SELECTED, CCA_TAB_STOP, CCA_ENABLEVISIBLE
- };
- static const ::rtl::OUString* pBooleanPropertyNames[] =
- { // property names
-- &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP
-+ &PROPERTY_STATE, &PROPERTY_ENABLED, &PROPERTY_DROPDOWN, &PROPERTY_PRINTABLE, &PROPERTY_READONLY, &PROPERTY_DEFAULT_STATE, &PROPERTY_TABSTOP, &PROPERTY_ENABLEVISIBLE
- };
- static sal_Bool nBooleanPropertyAttrFlags[] =
- { // attribute defaults
-- BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID
-+ BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE | BOOLATTR_INVERSE_SEMANTICS, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_TRUE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_FALSE, BOOLATTR_DEFAULT_VOID, BOOLATTR_DEFAULT_FALSE
- };
- #if OSL_DEBUG_LEVEL > 0
- sal_Int32 nIdCount = sizeof(nBooleanPropertyAttributeIds) / sizeof(nBooleanPropertyAttributeIds[0]);
-Index: xmloff/source/forms/strings.hxx
-===================================================================
---- xmloff/source/forms/strings.hxx (revision 271402)
-+++ xmloff/source/forms/strings.hxx (working copy)
-@@ -114,6 +114,7 @@
- XMLFORM_CONSTASCII_STRING( PROPERTY_TABSTOP, "Tabstop" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_STATE, "State" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
-+ XMLFORM_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_MAXTEXTLENGTH, "MaxTextLen" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_LINECOUNT, "LineCount" );
- XMLFORM_CONSTASCII_STRING( PROPERTY_TABINDEX, "TabIndex" );
-Index: xmloff/source/forms/formattributes.cxx
-===================================================================
---- xmloff/source/forms/formattributes.cxx (revision 271402)
-+++ xmloff/source/forms/formattributes.cxx (working copy)
-@@ -60,6 +60,7 @@
- case CCA_CURRENT_SELECTED: return "current-selected";
- case CCA_CURRENT_VALUE: return "current-value";
- case CCA_DISABLED: return "disabled";
-+ case CCA_ENABLEVISIBLE: return "visible";
- case CCA_DROPDOWN: return "dropdown";
- case CCA_FOR: return "for";
- case CCA_IMAGE_DATA: return "image-data";
-Index: sc/source/filter/excel/xeescher.cxx
-===================================================================
---- sc/source/filter/excel/xeescher.cxx (revision 271402)
-+++ sc/source/filter/excel/xeescher.cxx (working copy)
-@@ -391,6 +391,9 @@
- rEscherEx.OpenContainer( ESCHER_SpContainer );
- rEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT );
- EscherPropertyContainer aPropOpt;
-+ bool bVisible = aCtrlProp.GetBoolProperty( CREATE_OUSTRING( "EnableVisible" ) );
-+ aPropOpt.AddOpt( ESCHER_Prop_fPrint, bVisible ? 0x00080000 : 0x00080002 ); // visible flag
-+
- aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01000100 ); // bool field
- aPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // Text ID
- aPropOpt.AddOpt( ESCHER_Prop_WrapText, 0x00000001 );
-Index: sc/source/filter/excel/xiescher.cxx
-===================================================================
---- sc/source/filter/excel/xiescher.cxx (revision 271402)
-+++ sc/source/filter/excel/xiescher.cxx (working copy)
-@@ -1702,7 +1702,7 @@
- aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
-
- // control visible and printable?
--// aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() ); // waiting for #i88878#
-+ aPropSet.SetBoolProperty( CREATE_OUSTRING( "EnableVisible" ), rDrawObj.IsVisible() );
- aPropSet.SetBoolProperty( CREATE_OUSTRING( "Printable" ), rDrawObj.IsPrintable() );
-
- // sheet links
-Index: toolkit/source/helper/property.cxx
-===================================================================
---- toolkit/source/helper/property.cxx (revision 271402)
-+++ toolkit/source/helper/property.cxx (working copy)
-@@ -272,7 +272,8 @@
- DECL_PROP_2 ( "DialogSourceURL", DIALOGSOURCEURL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
- DECL_PROP_2 ( "URL", URL, ::rtl::OUString, BOUND, MAYBEDEFAULT ),
- DECL_PROP_2 ( "WritingMode", WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT ),
-- DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT )
-+ DECL_PROP_3 ( "ContextWritingMode", CONTEXT_WRITING_MODE, sal_Int16, BOUND, MAYBEDEFAULT, TRANSIENT ),
-+ DECL_PROP_2 ( "EnableVisible", ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT )
- };
- pPropertyInfos = aImplPropertyInfos;
- nElements = sizeof( aImplPropertyInfos ) / sizeof( ImplPropertyInfo );
-Index: toolkit/source/controls/unocontrolmodel.cxx
-===================================================================
---- toolkit/source/controls/unocontrolmodel.cxx (revision 271402)
-+++ toolkit/source/controls/unocontrolmodel.cxx (working copy)
-@@ -345,6 +345,7 @@
- case BASEPROPERTY_SCALEIMAGE:
- case BASEPROPERTY_ENABLED:
- case BASEPROPERTY_PRINTABLE:
-+ case BASEPROPERTY_ENABLEVISIBLE:
- case BASEPROPERTY_DECORATION: aDefault <<= (sal_Bool) sal_True; break;
-
- case BASEPROPERTY_HELPTEXT:
-Index: toolkit/source/controls/unocontrols.cxx
-===================================================================
---- toolkit/source/controls/unocontrols.cxx (revision 271402)
-+++ toolkit/source/controls/unocontrols.cxx (working copy)
-@@ -491,6 +491,7 @@
- ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
-@@ -1788,6 +1789,7 @@
- {
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
-@@ -3613,6 +3615,7 @@
- ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_FILLCOLOR );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
-@@ -3742,6 +3745,7 @@
- ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
-Index: toolkit/source/controls/formattedcontrol.cxx
-===================================================================
---- toolkit/source/controls/formattedcontrol.cxx (revision 271402)
-+++ toolkit/source/controls/formattedcontrol.cxx (working copy)
-@@ -142,6 +142,7 @@
- ImplRegisterProperty( BASEPROPERTY_EFFECTIVE_MAX );
- ImplRegisterProperty( BASEPROPERTY_EFFECTIVE_MIN );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_FONTDESCRIPTOR );
- ImplRegisterProperty( BASEPROPERTY_FORMATKEY );
- ImplRegisterProperty( BASEPROPERTY_FORMATSSUPPLIER );
-Index: toolkit/source/controls/tree/treecontrol.cxx
-===================================================================
---- toolkit/source/controls/tree/treecontrol.cxx (revision 271402)
-+++ toolkit/source/controls/tree/treecontrol.cxx (working copy)
-@@ -65,6 +65,7 @@
- ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_FILLCOLOR );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
-Index: toolkit/source/controls/unocontrol.cxx
-===================================================================
---- toolkit/source/controls/unocontrol.cxx (revision 271402)
-+++ toolkit/source/controls/unocontrol.cxx (working copy)
-@@ -1054,7 +1054,13 @@
- }
-
- if ( xDrawPeerView.is() )
-+ {
-+ Reference< XVclWindowPeer > xWindowPeer;
-+ xWindowPeer.set( xDrawPeer, UNO_QUERY );
-+ if ( xWindowPeer.is() )
-+ xWindowPeer->setDesignMode( mbDesignMode );
- xDrawPeerView->draw( x, y );
-+ }
-
- if ( bDisposeDrawPeer )
- xDrawPeer->dispose();
-@@ -1413,7 +1429,6 @@
- // remember this
- mbDesignMode = bOn;
- xWindow = xWindow.query( getPeer() );
--
- // dispose our current AccessibleContext, if we have one
- // (changing the design mode implies having a new implementation for this context,
- // so the old one must be declared DEFUNC)
-Index: toolkit/source/controls/tkspinbutton.cxx
-===================================================================
---- toolkit/source/controls/tkspinbutton.cxx (revision 271402)
-+++ toolkit/source/controls/tkspinbutton.cxx (working copy)
-@@ -60,6 +60,7 @@
- ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
- ImplRegisterProperty( BASEPROPERTY_DEFAULTCONTROL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
-+ ImplRegisterProperty( BASEPROPERTY_ENABLEVISIBLE );
- ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
- ImplRegisterProperty( BASEPROPERTY_HELPURL );
- ImplRegisterProperty( BASEPROPERTY_ORIENTATION );
-Index: toolkit/source/awt/vclxwindow.cxx
-===================================================================
---- toolkit/source/awt/vclxwindow.cxx (revision 271402)
-+++ toolkit/source/awt/vclxwindow.cxx (working copy)
-@@ -226,6 +226,8 @@
- ::toolkit::AccessibilityClient maAccFactory;
- bool mbDisposed;
- bool mbDrawingOntoParent; // no bit mask, is passed around by reference
-+ sal_Bool mbEnableVisible;
-+ sal_Bool mbDirectVisible;
-
- ::osl::Mutex maListenerContainerMutex;
- ::cppu::OInterfaceContainerHelper maWindow2Listeners;
-@@ -273,6 +275,15 @@
- */
- VCLXWindowImpl( VCLXWindow& _rAntiImpl, ::vos::IMutex& _rMutex, bool _bWithDefaultProps );
-
-+ /** synchronously mbEnableVisible
-+ */
-+ void setEnableVisible( sal_Bool bEnableVisible ) { mbEnableVisible = bEnableVisible; }
-+ sal_Bool isEnableVisible() { return mbEnableVisible; }
-+ /** synchronously mbDirectVisible;
-+ */
-+ void setDirectVisible( sal_Bool bDirectVisible ) { mbDirectVisible = bDirectVisible; }
-+ sal_Bool isDirectVisible() { return mbDirectVisible; }
-+
- /** asynchronously notifies a mouse event to the VCLXWindow's XMouseListeners
- */
- void notifyMouseEvent( const awt::MouseEvent& _rMouseEvent, MouseEventType _nType );
-@@ -347,6 +358,8 @@
- ,mrMutex( _rMutex )
- ,mbDisposed( false )
- ,mbDrawingOntoParent( false )
-+ ,mbEnableVisible(sal_True)
-+ ,mbDirectVisible(sal_True)
- ,maListenerContainerMutex( )
- ,maWindow2Listeners( maListenerContainerMutex )
- ,maDockableWindowListeners( maListenerContainerMutex )
-@@ -623,7 +636,12 @@
- SetOutputDevice( pWindow );
-
- if ( GetWindow() )
-+ {
- GetWindow()->AddEventListener( LINK( this, VCLXWindow, WindowEventListener ) );
-+ sal_Bool bDirectVisible = pWindow ? pWindow->IsVisible() : false;
-+ mpImpl->setDirectVisible( bDirectVisible );
-+ }
-+
- }
-
- void VCLXWindow::suspendVclEventListening( )
-@@ -1224,7 +1242,8 @@
- }
- }
- */
-- pWindow->Show( bVisible );
-+ mpImpl->setDirectVisible( bVisible );
-+ pWindow->Show( bVisible && mpImpl->isEnableVisible() );
- }
- }
-
-@@ -1527,6 +1546,7 @@
- BASEPROPERTY_HELPURL,
- BASEPROPERTY_TEXT,
- BASEPROPERTY_PRINTABLE,
-+ BASEPROPERTY_ENABLEVISIBLE, // for visibility
- BASEPROPERTY_TABSTOP,
- 0);
-
-@@ -1670,6 +1690,21 @@
- setEnable( b );
- }
- break;
-+ case BASEPROPERTY_ENABLEVISIBLE:
-+ {
-+ sal_Bool b = sal_False;
-+ if ( Value >>= b )
-+ {
-+ if( b != mpImpl->isEnableVisible() )
-+ {
-+ mpImpl->setEnableVisible( b );
-+ Window* pWindow = GetWindow();
-+ if ( pWindow )
-+ pWindow->Show( b && mpImpl->isDirectVisible() );
-+ }
-+ }
-+ }
-+ break;
- case BASEPROPERTY_TEXT:
- case BASEPROPERTY_LABEL:
- case BASEPROPERTY_TITLE:
-@@ -2135,6 +2170,10 @@
- aProp <<= (sal_Bool) GetWindow()->IsEnabled();
- break;
-
-+ case BASEPROPERTY_ENABLEVISIBLE:
-+ aProp <<= (sal_Bool) mpImpl->isEnableVisible();
-+ break;
-+
- case BASEPROPERTY_TEXT:
- case BASEPROPERTY_LABEL:
- case BASEPROPERTY_TITLE:
-@@ -2408,8 +2447,8 @@
- Window* pWindow = GetWindow();
- if ( !pWindow )
- return;
--
-- if ( pWindow )
-+
-+ if ( isDesignMode() || mpImpl->isEnableVisible() )
- {
- TabPage* pTabPage = dynamic_cast< TabPage* >( pWindow );
- if ( pTabPage )
-Index: toolkit/source/awt/vclxwindows.cxx
-===================================================================
---- toolkit/source/awt/vclxwindows.cxx (revision 271402)
-+++ toolkit/source/awt/vclxwindows.cxx (working copy)
-@@ -386,6 +386,7 @@
- BASEPROPERTY_DEFAULTBUTTON,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_GRAPHIC,
- BASEPROPERTY_HELPTEXT,
-@@ -661,6 +662,7 @@
- BASEPROPERTY_BORDERCOLOR,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_GRAPHIC,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -789,6 +791,7 @@
- PushPropertyIds( rIds,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_GRAPHIC,
- BASEPROPERTY_HELPTEXT,
-@@ -1088,6 +1091,7 @@
- PushPropertyIds( rIds,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_GRAPHIC,
- BASEPROPERTY_HELPTEXT,
-@@ -1505,6 +1509,7 @@
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_DROPDOWN,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -2692,6 +2697,7 @@
- BASEPROPERTY_BORDERCOLOR,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -2720,6 +2726,7 @@
- BASEPROPERTY_BORDERCOLOR,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -2862,6 +2869,7 @@
- BASEPROPERTY_BORDERCOLOR,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
- BASEPROPERTY_LINEINCREMENT,
-@@ -3341,6 +3349,7 @@
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ECHOCHAR,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HARDLINEBREAKS,
- BASEPROPERTY_HELPTEXT,
-@@ -3717,6 +3726,7 @@
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_DROPDOWN,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -4226,6 +4236,7 @@
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_DROPDOWN,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_EXTDATEFORMAT,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
-@@ -4562,6 +4573,7 @@
- BASEPROPERTY_BORDERCOLOR,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_EXTTIMEFORMAT,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
-@@ -4863,6 +4875,7 @@
- BASEPROPERTY_DECIMALACCURACY,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -5203,6 +5216,7 @@
- BASEPROPERTY_DECIMALACCURACY,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -5453,6 +5467,7 @@
- BASEPROPERTY_DECIMALACCURACY,
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-@@ -5804,6 +5819,7 @@
- BASEPROPERTY_DEFAULTCONTROL,
- BASEPROPERTY_EDITMASK,
- BASEPROPERTY_ENABLED,
-+ BASEPROPERTY_ENABLEVISIBLE,
- BASEPROPERTY_FONTDESCRIPTOR,
- BASEPROPERTY_HELPTEXT,
- BASEPROPERTY_HELPURL,
-Index: toolkit/inc/toolkit/helper/property.hxx
-===================================================================
---- toolkit/inc/toolkit/helper/property.hxx (revision 271402)
-+++ toolkit/inc/toolkit/helper/property.hxx (working copy)
-@@ -191,6 +191,7 @@
- #define BASEPROPERTY_IMAGE_SCALE_MODE 137
- #define BASEPROPERTY_WRITING_MODE 138
- #define BASEPROPERTY_CONTEXT_WRITING_MODE 139
-+#define BASEPROPERTY_ENABLEVISIBLE 140 // sal_Bool
-
- // Keine gebundenen Properties, werden immer aus der Property BASEPROPERTY_FONTDESCRIPTOR entnommen.
- #define BASEPROPERTY_FONTDESCRIPTORPART_START 1000
-Index: extensions/source/propctrlr/formres.src
-===================================================================
---- extensions/source/propctrlr/formres.src (revision 271402)
-+++ extensions/source/propctrlr/formres.src (working copy)
-@@ -51,6 +51,10 @@
- {
- Text [ en-US ] = "Enabled" ;
- };
-+String RID_STR_ENABLE_VISIBLE
-+{
-+ Text [ en-US ] = "Visible" ;
-+};
- String RID_STR_AUTOCOMPLETE
- {
- Text [ en-US ] = "AutoFill" ;
-Index: extensions/source/propctrlr/formmetadata.cxx
-===================================================================
---- extensions/source/propctrlr/formmetadata.cxx (revision 271402)
-+++ extensions/source/propctrlr/formmetadata.cxx (working copy)
-@@ -149,6 +149,7 @@
- DEF_INFO_3( LITERALMASK, LITERALMASK, LITERALMASK, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
- DEF_INFO_3( STRICTFORMAT, STRICTFORMAT, STRICTFORMAT, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
- DEF_INFO_3( ENABLED, ENABLED, ENABLED, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-+ DEF_INFO_3( ENABLE_VISIBLE, ENABLE_VISIBLE, ENABLE_VISIBLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
- DEF_INFO_3( READONLY, READONLY, READONLY, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
- DEF_INFO_3( PRINTABLE, PRINTABLE, PRINTABLE, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
- DEF_INFO_3( STEP, STEP, STEP, FORM_VISIBLE, DIALOG_VISIBLE, COMPOSEABLE ),
-Index: extensions/source/propctrlr/formresid.hrc
-===================================================================
---- extensions/source/propctrlr/formresid.hrc (revision 271402)
-+++ extensions/source/propctrlr/formresid.hrc (working copy)
-@@ -150,6 +150,7 @@
- #define RID_STR_INPUT_REQUIRED ( RID_FORMBROWSER_START + 119 )
- #define RID_STR_UNCHECKEDREFVALUE ( RID_FORMBROWSER_START + 120 )
- #define RID_STR_CURSOR_TYPE ( RID_FORMBROWSER_START + 121 )
-+#define RID_STR_ENABLE_VISIBLE ( RID_FORMBROWSER_START + 122 )
- // FREE
- // FREE
- // FREE
-@@ -158,7 +159,6 @@
- // FREE
- // FREE
- // FREE
-- // FREE
- #define RID_STR_ENUM_NAVIGATION ( RID_FORMBROWSER_START + 131 )
- #define RID_STR_EVT_APPROVEACTIONPERFORMED ( RID_FORMBROWSER_START + 132 )
- #define RID_STR_EVT_ACTIONPERFORMED ( RID_FORMBROWSER_START + 133 )
-Index: extensions/source/propctrlr/formstrings.hxx
-===================================================================
---- extensions/source/propctrlr/formstrings.hxx (revision 271402)
-+++ extensions/source/propctrlr/formstrings.hxx (working copy)
-@@ -57,6 +57,7 @@
- PCR_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField");
- PCR_CONSTASCII_STRING( PROPERTY_INPUT_REQUIRED, "InputRequired");
- PCR_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled");
-+ PCR_CONSTASCII_STRING( PROPERTY_ENABLE_VISIBLE, "EnableVisible" );
- PCR_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly");
- PCR_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly");
- PCR_CONSTASCII_STRING( PROPERTY_FILTER, "Filter");
-Index: extensions/source/propctrlr/formmetadata.hxx
-===================================================================
---- extensions/source/propctrlr/formmetadata.hxx (revision 271402)
-+++ extensions/source/propctrlr/formmetadata.hxx (working copy)
-@@ -340,6 +340,7 @@
- #define PROPERTY_ID_SCALE_MODE 196
- #define PROPERTY_ID_INPUT_REQUIRED 197
- #define PROPERTY_ID_WRITING_MODE 198
-+ #define PROPERTY_ID_ENABLE_VISIBLE 199
-
- //............................................................................
- } // namespace pcr
-Index: extensions/inc/extensio.hrc
-===================================================================
---- extensions/inc/extensio.hrc (revision 271402)
-+++ extensions/inc/extensio.hrc (working copy)
-@@ -249,7 +249,7 @@
- #define HID_PROP_ECHO_CHAR (HID_FORMS_START + 91)
- #define HID_PROP_EMPTY_IS_NULL (HID_FORMS_START + 92)
- #define HID_PROP_DECIMAL_ACCURACY (HID_FORMS_START + 93)
-- // FREE
-+#define HID_PROP_ENABLE_VISIBLE (HID_FORMS_START + 94)
- #define HID_PROP_DEFAULT_BUTTON (HID_FORMS_START + 95)
- #define HID_PROP_HIDDEN_VALUE (HID_FORMS_START + 96)
- #define HID_PROP_TRISTATE (HID_FORMS_START + 97)
-Index: extensions/util/hidother.src
-===================================================================
---- extensions/util/hidother.src (revision 271402)
-+++ extensions/util/hidother.src (working copy)
-@@ -308,3 +308,4 @@
- hidspecial HID_PROP_NOLABEL { HelpId = HID_PROP_NOLABEL; }
- hidspecial HID_PROP_INPUT_REQUIRED { HelpId = HID_PROP_INPUT_REQUIRED; }
- hidspecial HID_PROP_WRITING_MODE { HelpId = HID_PROP_WRITING_MODE; }
-+hidspecial HID_PROP_ENABLE_VISIBLE { HelpId = HID_PROP_ENABLE_VISIBLE; }
-Index: xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
-===================================================================
---- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx (revision 271402)
-+++ xmlscript/source/xmldlg_imexp/xmldlg_import.cxx (working copy)
-@@ -33,6 +33,7 @@
- #include "imp_share.hxx"
-
- #include <osl/diagnose.h>
-+#include <tools/diagnose_ex.h>
- #include <osl/mutex.hxx>
-
- #include <rtl/ustrbuf.hxx>
-@@ -1612,6 +1613,23 @@
- OUString( RTL_CONSTASCII_USTRINGPARAM("Enabled") ), makeAny( sal_False ) );
- }
-
-+ sal_Bool bVisible = sal_True;
-+ if (getBoolAttr(
-+ &bVisible, OUString( RTL_CONSTASCII_USTRINGPARAM("visible") ),
-+ xAttributes, _pImport->XMLNS_DIALOGS_UID ) && !bVisible)
-+ {
-+ try
-+ {
-+
-+ _xControlModel->setPropertyValue(
-+ OUString( RTL_CONSTASCII_USTRINGPARAM("EnableVisible") ), makeAny( sal_False ) );
-+ }
-+ catch( Exception& )
-+ {
-+ DBG_UNHANDLED_EXCEPTION();
-+ }
-+ }
-+
- if (!importLongProperty( nBaseX,
- OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ),
- OUString( RTL_CONSTASCII_USTRINGPARAM("left") ),
-Index: xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
-===================================================================
---- xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (revision 271402)
-+++ xmlscript/source/xmldlg_imexp/xmldlg_export.cxx (working copy)
-@@ -33,6 +33,7 @@
- #include "exp_share.hxx"
-
- #include <rtl/ustrbuf.hxx>
-+#include <tools/diagnose_ex.h>
-
- #include <com/sun/star/awt/CharSet.hpp>
- #include <com/sun/star/awt/FontFamily.hpp>
-@@ -996,6 +997,24 @@
- OSL_ENSURE( 0, "unexpected property type for \"Enabled\": not bool!" );
- }
-
-+ sal_Bool bVisible = sal_True;
-+ try
-+ {
-+ if (_xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("EnableVisible") ) ) >>= bVisible)
-+ {
-+
-+ // only write out the non default case
-+ if (! bVisible)
-+ {
-+ addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM(XMLNS_DIALOGS_PREFIX ":visible") ),
-+ OUString( RTL_CONSTASCII_USTRINGPARAM("false") ) );
-+ }
-+ }
-+ }
-+ catch( Exception& )
-+ {
-+ DBG_UNHANDLED_EXCEPTION();
-+ }
- // force writing of pos/size
- a = _xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("PositionX") ) );
- if (a.getValueTypeClass() == TypeClass_LONG)
-Index: svx/source/msfilter/msocximex.cxx
-===================================================================
---- svx/source/msfilter/msocximex.cxx (revision 271402)
-+++ svx/source/msfilter/msocximex.cxx (working copy)
-@@ -623,7 +623,11 @@
- pS->SeekRel( 4 );
- // option flags
- if( nContentFlags & 0x00000010 )
-- pS->SeekRel( 4 );
-+ {
-+ sal_uInt32 nBitFlags = 0;
-+ *pS >> nBitFlags;
-+ rec.bVisible = ( ( nBitFlags & 0x02 ) == 0x02 );
-+ }
- // substream size
- if( nContentFlags & 0x00000020 )
- *pS >> rec.nSubStreamLen;
-@@ -1207,6 +1211,13 @@
- xPropSet->setPropertyValue(WW8_ASCII2STR("Step"), aTmp);
- }
-
-+ try
-+ {
-+ xPropSet->setPropertyValue(WW8_ASCII2STR("EnableVisible"), uno::makeAny( mbVisible ) );
-+ }
-+ catch( uno::Exception& )
-+ {
-+ }
- return sal_True;
- }
-
-@@ -3606,6 +3617,7 @@
- // reflect the ms tabbing from orig MS UserForm, see below
- pControl->mnTabPos = rec.nTabPos;
- pControl->SetInDialog(true);
-+ pControl->mbVisible = rec.bVisible;
- if ( mnStep )
- {
- // If the container has a step then it should be
-Index: svx/inc/svx/msocximex.hxx
-===================================================================
---- svx/inc/svx/msocximex.hxx (revision 271402)
-+++ svx/inc/svx/msocximex.hxx (working copy)
-@@ -230,7 +230,7 @@
- {
- public:
- OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0),
-- mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), sName(sN), pDocSh(0),
-+ mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), mbVisible(true), sName(sN), pDocSh(0),
- bSetInDialog(FALSE), mpParent( parent ) {}
- sal_Bool FullRead(SotStorageStream *pS)
- {
-@@ -287,6 +287,7 @@
- sal_Int32 mnBackColor;
- sal_Int32 mnForeColor;
- sal_uInt16 mnTabPos;
-+ bool mbVisible;
- UniString sName;
- OCX_FontData aFontData;
- SfxObjectShell *pDocSh;
-@@ -482,7 +483,7 @@
- };
- struct ContainerRecord
- {
-- ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0) {}
-+ ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0), bVisible( true ) {}
-
- ::rtl::OUString cName;
- ::rtl::OUString controlTip;
-@@ -493,6 +494,7 @@
- sal_uInt32 nSubStreamLen;
- sal_uInt16 nTabPos;
- sal_uInt16 nTypeIdent;
-+ bool bVisible;
- };
-
- typedef std::vector<OCX_Control*>::iterator CtrlIterator;
-Index: forms/source/component/navigationbar.hxx
-===================================================================
---- forms/source/component/navigationbar.hxx (revision 271402)
-+++ forms/source/component/navigationbar.hxx (working copy)
-@@ -70,6 +70,7 @@
- sal_Int16 m_nBorder;
- sal_Int32 m_nDelay;
- sal_Bool m_bEnabled;
-+ sal_Bool m_bEnableVisible;
- sal_Bool m_bShowPosition;
- sal_Bool m_bShowNavigation;
- sal_Bool m_bShowActions;
-Index: forms/source/component/Grid.hxx
-===================================================================
---- forms/source/component/Grid.hxx (revision 271402)
-+++ forms/source/component/Grid.hxx (working copy)
-@@ -94,6 +94,7 @@
- sal_Int16 m_nBorder;
- sal_Int16 m_nWritingMode;
- sal_Int16 m_nContextWritingMode;
-+ sal_Bool m_bEnableVisible;
- sal_Bool m_bEnable : 1;
- sal_Bool m_bNavigation : 1;
- sal_Bool m_bRecordMarker : 1;
-Index: forms/source/component/navigationbar.cxx
-===================================================================
---- forms/source/component/navigationbar.cxx (revision 271402)
-+++ forms/source/component/navigationbar.cxx (working copy)
-@@ -84,6 +84,7 @@
- getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder;
- getPropertyDefaultByHandle( PROPERTY_ID_DELAY ) >>= m_nDelay;
- getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled;
-+ getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible;
- getPropertyDefaultByHandle( PROPERTY_ID_SHOW_POSITION ) >>= m_bShowPosition;
- getPropertyDefaultByHandle( PROPERTY_ID_SHOW_NAVIGATION ) >>= m_bShowNavigation;
- getPropertyDefaultByHandle( PROPERTY_ID_SHOW_RECORDACTIONS ) >>= m_bShowActions;
-@@ -107,6 +108,7 @@
- m_sHelpText = _pOriginal->m_sHelpText;
- m_sHelpURL = _pOriginal->m_sHelpURL;
- m_bEnabled = _pOriginal->m_bEnabled;
-+ m_bEnableVisible = _pOriginal->m_bEnableVisible;
- m_nIconSize = _pOriginal->m_nIconSize;
- m_nBorder = _pOriginal->m_nBorder;
- m_nDelay = _pOriginal->m_nDelay;
-@@ -125,6 +127,7 @@
- REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
-+ REGISTER_PROP_2( ENABLEVISIBLE, m_bEnableVisible, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( ICONSIZE, m_nIconSize, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( BORDER, m_nBorder, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( DELAY, m_nDelay, BOUND, MAYBEDEFAULT );
-@@ -444,6 +447,7 @@
- break;
-
- case PROPERTY_ID_ENABLED:
-+ case PROPERTY_ID_ENABLEVISIBLE:
- case PROPERTY_ID_SHOW_POSITION:
- case PROPERTY_ID_SHOW_NAVIGATION:
- case PROPERTY_ID_SHOW_RECORDACTIONS:
-Index: forms/source/component/Grid.cxx
-===================================================================
---- forms/source/component/Grid.cxx (revision 271402)
-+++ forms/source/component/Grid.cxx (working copy)
-@@ -103,6 +103,7 @@
- ,m_nBorder(1)
- ,m_nWritingMode( WritingMode2::CONTEXT )
- ,m_nContextWritingMode( WritingMode2::CONTEXT )
-+ ,m_bEnableVisible(sal_True)
- ,m_bEnable(sal_True)
- ,m_bNavigation(sal_True)
- ,m_bRecordMarker(sal_True)
-@@ -128,6 +129,7 @@
-
- m_aDefaultControl = _pOriginal->m_aDefaultControl;
- m_bEnable = _pOriginal->m_bEnable;
-+ m_bEnableVisible = _pOriginal->m_bEnableVisible;
- m_bNavigation = _pOriginal->m_bNavigation;
- m_nBorder = _pOriginal->m_nBorder;
- m_nWritingMode = _pOriginal->m_nWritingMode;
-@@ -415,7 +417,7 @@
- //------------------------------------------------------------------------------
- void OGridControlModel::describeFixedProperties( Sequence< Property >& _rProps ) const
- {
-- BEGIN_DESCRIBE_BASE_PROPERTIES( 36 )
-+ BEGIN_DESCRIBE_BASE_PROPERTIES( 37 )
- DECL_PROP1(NAME, ::rtl::OUString, BOUND);
- DECL_PROP2(CLASSID, sal_Int16, READONLY, TRANSIENT);
- DECL_PROP1(TAG, ::rtl::OUString, BOUND);
-@@ -423,6 +425,7 @@
- DECL_PROP3(TABSTOP, sal_Bool, BOUND, MAYBEDEFAULT, MAYBEVOID);
- DECL_PROP2(HASNAVIGATION, sal_Bool, BOUND, MAYBEDEFAULT);
- DECL_PROP1(ENABLED, sal_Bool, BOUND);
-+ DECL_PROP2(ENABLEVISIBLE, sal_Bool, BOUND, MAYBEDEFAULT);
- DECL_PROP1(BORDER, sal_Int16, BOUND);
- DECL_PROP2(BORDERCOLOR, sal_Int16, BOUND, MAYBEVOID);
- DECL_PROP1(DEFAULTCONTROL, ::rtl::OUString, BOUND);
-@@ -496,6 +499,9 @@
- case PROPERTY_ID_ENABLED:
- setBOOL(rValue, m_bEnable);
- break;
-+ case PROPERTY_ID_ENABLEVISIBLE:
-+ setBOOL(rValue, m_bEnableVisible);
-+ break;
- case PROPERTY_ID_BORDER:
- rValue <<= (sal_Int16)m_nBorder;
- break;
-@@ -574,6 +580,9 @@
- case PROPERTY_ID_ENABLED:
- bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnable);
- break;
-+ case PROPERTY_ID_ENABLEVISIBLE:
-+ bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_bEnableVisible);
-+ break;
- case PROPERTY_ID_BORDER:
- bModified = tryPropertyValue(rConvertedValue, rOldValue, rValue, m_nBorder);
- break;
-@@ -645,6 +654,9 @@
- case PROPERTY_ID_ENABLED:
- m_bEnable = getBOOL(rValue);
- break;
-+ case PROPERTY_ID_ENABLEVISIBLE:
-+ m_bEnableVisible = getBOOL(rValue);
-+ break;
- case PROPERTY_ID_RECORDMARKER:
- m_bRecordMarker = getBOOL(rValue);
- break;
-@@ -702,6 +714,7 @@
- case PROPERTY_ID_RECORDMARKER:
- case PROPERTY_ID_DISPLAYSYNCHRON:
- case PROPERTY_ID_ENABLED:
-+ case PROPERTY_ID_ENABLEVISIBLE:
- aReturn = makeBoolAny(sal_True);
- break;
-
-Index: forms/source/inc/property.hrc
-===================================================================
---- forms/source/inc/property.hrc (revision 271402)
-+++ forms/source/inc/property.hrc (working copy)
-@@ -206,11 +206,11 @@
- #define PROPERTY_ID_FILTERPROPOSAL (PROPERTY_ID_START +162) // BOOL
- #define PROPERTY_ID_FIELDSOURCE (PROPERTY_ID_START +163) // String
- #define PROPERTY_ID_TABLENAME (PROPERTY_ID_START +164) // String
-+#define PROPERTY_ID_ENABLEVISIBLE (PROPERTY_ID_START +165) // BOOL
- // FREE
- // FREE
- // FREE
- // FREE
-- // FREE
- #define PROPERTY_ID_CONTROLLABEL (PROPERTY_ID_START +171) // XPropertySet
- #define PROPERTY_ID_CURRSYM_POSITION (PROPERTY_ID_START +172) // String
- // FREE
-Index: forms/source/inc/frm_strings.hxx
-===================================================================
---- forms/source/inc/frm_strings.hxx (revision 271402)
-+++ forms/source/inc/frm_strings.hxx (working copy)
-@@ -113,6 +113,7 @@
- FORMS_CONSTASCII_STRING( PROPERTY_CYCLE, "Cycle" );
- FORMS_CONSTASCII_STRING( PROPERTY_CONTROLSOURCE, "DataField" );
- FORMS_CONSTASCII_STRING( PROPERTY_ENABLED, "Enabled" );
-+ FORMS_CONSTASCII_STRING( PROPERTY_ENABLEVISIBLE, "EnableVisible" );
- FORMS_CONSTASCII_STRING( PROPERTY_READONLY, "ReadOnly" );
- FORMS_CONSTASCII_STRING( PROPERTY_RELEVANT, "Relevant" );
- FORMS_CONSTASCII_STRING( PROPERTY_ISREADONLY, "IsReadOnly" );
-Index: forms/source/richtext/richtextmodel.hxx
-===================================================================
---- forms/source/richtext/richtextmodel.hxx (revision 271402)
-+++ forms/source/richtext/richtextmodel.hxx (working copy)
-@@ -83,6 +83,7 @@
- sal_Int16 m_nContextWritingMode;
- sal_Int16 m_nBorder;
- sal_Bool m_bEnabled;
-+ sal_Bool m_bEnableVisible;
- sal_Bool m_bHardLineBreaks;
- sal_Bool m_bHScroll;
- sal_Bool m_bVScroll;
-Index: forms/source/richtext/richtextmodel.cxx
-===================================================================
---- forms/source/richtext/richtextmodel.cxx (revision 271402)
-+++ forms/source/richtext/richtextmodel.cxx (working copy)
-@@ -88,6 +88,7 @@
- getPropertyDefaultByHandle( PROPERTY_ID_DEFAULTCONTROL ) >>= m_sDefaultControl;
- getPropertyDefaultByHandle( PROPERTY_ID_BORDER ) >>= m_nBorder;
- getPropertyDefaultByHandle( PROPERTY_ID_ENABLED ) >>= m_bEnabled;
-+ getPropertyDefaultByHandle( PROPERTY_ID_ENABLEVISIBLE ) >>= m_bEnableVisible;
- getPropertyDefaultByHandle( PROPERTY_ID_HARDLINEBREAKS ) >>= m_bHardLineBreaks;
- getPropertyDefaultByHandle( PROPERTY_ID_HSCROLL ) >>= m_bHScroll;
- getPropertyDefaultByHandle( PROPERTY_ID_VSCROLL ) >>= m_bVScroll;
-@@ -124,6 +125,7 @@
- m_sHelpURL = _pOriginal->m_sHelpURL;
- m_nBorder = _pOriginal->m_nBorder;
- m_bEnabled = _pOriginal->m_bEnabled;
-+ m_bEnableVisible = _pOriginal->m_bEnableVisible;
- m_bHardLineBreaks = _pOriginal->m_bHardLineBreaks;
- m_bHScroll = _pOriginal->m_bHScroll;
- m_bVScroll = _pOriginal->m_bVScroll;
-@@ -188,6 +190,7 @@
- REGISTER_PROP_2( HELPTEXT, m_sHelpText, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( HELPURL, m_sHelpURL, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( ENABLED, m_bEnabled, BOUND, MAYBEDEFAULT );
-+ REGISTER_PROP_2( ENABLEVISIBLE, m_bEnableVisible, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( BORDER, m_nBorder, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( HARDLINEBREAKS, m_bHardLineBreaks, BOUND, MAYBEDEFAULT );
- REGISTER_PROP_2( HSCROLL, m_bHScroll, BOUND, MAYBEDEFAULT );
-@@ -456,6 +459,7 @@
- break;
-
- case PROPERTY_ID_ENABLED:
-+ case PROPERTY_ID_ENABLEVISIBLE:
- case PROPERTY_ID_PRINTABLE:
- case PROPERTY_ID_HIDEINACTIVESELECTION:
- aDefault <<= (sal_Bool)sal_True;
-Index: forms/source/misc/property.cxx
-===================================================================
---- forms/source/misc/property.cxx (revision 271402)
-+++ forms/source/misc/property.cxx (working copy)
-@@ -106,6 +106,7 @@
- ADD_PROP_ASSIGNMENT(CYCLE);
- ADD_PROP_ASSIGNMENT(CONTROLSOURCE);
- ADD_PROP_ASSIGNMENT(ENABLED);
-+ ADD_PROP_ASSIGNMENT(ENABLEVISIBLE);
- ADD_PROP_ASSIGNMENT(SPIN);
- ADD_PROP_ASSIGNMENT(READONLY);
- ADD_PROP_ASSIGNMENT(FILTER);
commit 1faff0ba69bec2bb494b14785ea14d65da127320
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 14:42:27 2009 +0300
speed-make-installer-2.diff is upstream.
* patches/dev300/speed-make-installer-2.diff: Delete
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 35a1652..d935283 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -436,9 +436,6 @@ sfx2-check-existing-template-dirs.diff, i#100518, pmladek
jpegc.c.diff, i#80674, n#272574, flr
[ Fixes ]
-# speed up make_installer.pl quite markedly.
-speed-make-installer-2.diff, i#97208, michael
-
# process relative SMB paths (in hyperlinks) correctly
tools-urlobj-smb-scheme-patch.diff, n#261623, flr
samba-hyperlinks-sc-sd.diff, n#382718, jholesov
diff --git a/patches/dev300/speed-make-installer-2.diff b/patches/dev300/speed-make-installer-2.diff
deleted file mode 100644
index 4b60d69..0000000
--- a/patches/dev300/speed-make-installer-2.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -u -r solenv/bin-pristine/make_installer.pl solenv/bin/make_installer.pl
---- solenv/bin-pristine/make_installer.pl 2008-11-25 19:22:01.000000000 +0000
-+++ solenv/bin/make_installer.pl 2008-12-12 15:25:33.000000000 +0000
-@@ -382,7 +382,7 @@
- installer::setupscript::resolve_lowercase_productname_setupscriptvariable($allscriptvariablesref);
- if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscriptvariables3.log" ,$allscriptvariablesref); }
-
--installer::setupscript::replace_all_setupscriptvariables_in_script($setupscriptref, $allscriptvariablesref);
-+$setupscriptref = installer::setupscript::replace_all_setupscriptvariables_in_script($setupscriptref, $allscriptvariablesref);
- if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript2.log" ,$setupscriptref); }
-
- # Adding all variables defined in the installation object into the hash of all variables.
-
-diff -u -r solenv/bin-pristine/modules/installer/setupscript.pm solenv/bin/modules/installer/setupscript.pm
---- solenv/bin/modules/installer/setupscript.pm.old 2009-04-02 12:53:08.000000000 +0200
-+++ solenv/bin/modules/installer/setupscript.pm 2009-04-03 20:30:33.000000000 +0200
-@@ -248,22 +248,30 @@ sub replace_all_setupscriptvariables_in_
- }
- }
-
-- for ( my $i = 0; $i <= $#{$scriptref}; $i++ )
-- {
-- my $line = ${$scriptref}[$i];
--
-- if ( $line =~ /^.*\%\w+.*$/ ) # only oif "%" occurs
-- {
-- # Attention: It must be possible to substitute "%PRODUCTNAMEn", "%PRODUCTNAME%PRODUCTVERSIONabc"
--
-- foreach my $key ( keys %subs )
-- {
-- my $value = $subs{$key};
-- $line =~ s/$key/$value/g;
-- ${$scriptref}[$i] = $line;
-- }
-- }
-+ # This is far faster than running a regexp for each line
-+ my $bigstring = '';
-+ for my $line (@{$scriptref}) {
-+ $bigstring = $bigstring . $line;
-+ }
-+ foreach my $key ( keys %subs )
-+ {
-+ # Attention: It must be possible to substitute "%PRODUCTNAMEn", "%PRODUCTNAME%PRODUCTVERSIONabc"
-+ my $value = $subs{$key};
-+ $bigstring =~ s/$key/$value/g;
-+ }
-+ my @newlines = split /\n/, $bigstring;
-+ $scriptref = \@newlines;
-+
-+ # now check for any mis-named '%' variables that we have left
-+ my $num = 0;
-+ for my $check (@newlines) {
-+ $num++;
-+ if ( $check =~ /^.*\%\w+.*$/ ) {
-+ print STDERR "Warning: mis-named or un-known '%' variable at line $num:\n$check\n";
-+ }
- }
-+
-+ return $scriptref;
- }
-
- #######################################################################
commit afa1130056bbe90a22f5d371a9a659f66015557e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 14:39:25 2009 +0300
speed-make-installer.diff is upstream.
* patches/dev300/speed-make-installer.diff: Delete
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 11fca44..35a1652 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -437,7 +437,6 @@ jpegc.c.diff, i#80674, n#272574, flr
[ Fixes ]
# speed up make_installer.pl quite markedly.
-speed-make-installer.diff, i#97124, michael
speed-make-installer-2.diff, i#97208, michael
# process relative SMB paths (in hyperlinks) correctly
diff --git a/patches/dev300/speed-make-installer.diff b/patches/dev300/speed-make-installer.diff
deleted file mode 100644
index 2b3feae..0000000
--- a/patches/dev300/speed-make-installer.diff
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: modules/installer/scriptitems.pm
-===================================================================
-RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v
-retrieving revision 1.51.18.2
-diff -u -p -r1.51.18.2 scriptitems.pm
---- solenv/bin/modules/installer/scriptitems.pm 22 Aug 2008 09:16:03 -0000 1.51.18.2
-+++ solenv/bin/modules/installer/scriptitems.pm 11 Dec 2008 07:06:08 -0000
-@@ -2361,33 +2363,66 @@ sub resolve_links_with_flag_relative
- # This function is a helper of function "assigning_modules_to_items"
- ########################################################################
-
-+sub insert_for_item ($$$)
-+{
-+ my ($hash, $item, $id) = @_;
-+
-+# print STDERR "insert '$id' for '$item'\n";
-+ if (!defined $hash->{$item}) {
-+ my @gids = ();
-+ $hash->{$item} = \@gids;
-+ }
-+ my $gid_list = $hash->{$item};
-+ push @{$gid_list}, $id;
-+ $hash->{$item} = $gid_list;
-+}
-+
-+sub build_modulegids_table
-+{
-+ my ($modulesref, $itemname) = @_;
-+ my %module_lookup_table;
-+
-+ # build map of item names to list of respective module gids
-+ # containing these items
-+ for my $onemodule (@{$modulesref})
-+ {
-+ next if ( ! defined $onemodule->{$itemname} );
-+ # these are the items contained in this module
-+ # eg. Files = (gid_a_b_c,gid_d_e_f)
-+ my $module_gids = $onemodule->{$itemname};
-+
-+ # prune outer brackets
-+ $module_gids =~ s|^\s*\(||g;
-+ $module_gids =~ s|\)\s*$||g;
-+ for my $id (split (/,/, $module_gids))
-+ {
-+ chomp $id;
-+ insert_for_item (\%module_lookup_table, lc ($id), $onemodule->{'gid'});
-+ }
-+ }
-+
-+ return \%module_lookup_table;
-+}
-+
- sub get_string_of_modulegids_for_itemgid
- {
-- my ($modulesref, $itemgid, $itemname) = @_;
-+ my ($module_lookup_table, $modulesref, $itemgid, $itemname) = @_;
-
- if ( $installer::globals::debug ) { installer::logger::debuginfo("installer::scriptitems::get_string_of_modulegids_for_itemgid : $#{$modulesref} : $itemgid : $itemname"); }
-
- my $allmodules = "";
- my $haslanguagemodule = 0;
- my %foundmodules = ();
--
-- for ( my $i = 0; $i <= $#{$modulesref}; $i++ )
-- {
-- my $onemodule = ${$modulesref}[$i];
-- my $allitems = "";
--
-- if ( $onemodule->{$itemname} ) { $allitems = $onemodule->{$itemname}; }
--
-- if ( $allitems =~ /\b$itemgid\b/i )
-- {
-- $allmodules = $allmodules . "," . $onemodule->{'gid'};
-- $foundmodules{$onemodule->{'gid'}} = 1;
--
-- # Is this module a language module? This info should be stored at the file.
-- if ( exists($installer::globals::alllangmodules{$onemodule->{'gid'}}) ) { $haslanguagemodule = 1; }
-- }
-+
-+# print STDERR "lookup '" . lc($itemgid) . "'\n";
-+ my $gid_list = $module_lookup_table->{lc($itemgid)};
-+
-+ for my $gid (@{$gid_list}) {
-+ $foundmodules{$gid} = 1;
-+ $allmodules = $allmodules . "," . $gid;
-+ # Is this module a language module? This info should be stored at the file.
-+ if ( exists($installer::globals::alllangmodules{$gid}) ) { $haslanguagemodule = 1; }
- }
--
- $allmodules =~ s/^\s*\,//; # removing leading comma
-
- # Check: All modules or no module must have flag LANGUAGEMODULE
-@@ -2397,6 +2432,8 @@ sub get_string_of_modulegids_for_itemgid
- if ( ! $isreallylanguagemodule ) { installer::exiter::exit_program("ERROR: \"$itemgid\" is assigned to modules with flag \"LANGUAGEMODULE\" and also to modules without this flag! Modules: $allmodules", "get_string_of_modulegids_for_itemgid"); }
- }
-
-+# print STDERR "get_string_for_itemgid ($itemgid, $itemname) => $allmodules, $haslanguagemodule\n";
-+
- return ($allmodules, $haslanguagemodule);
- }
-
-@@ -2414,10 +2451,11 @@ sub assigning_modules_to_items
- my $infoline = "";
- my $languageassignmenterror = 0;
- my @languageassignmenterrors = ();
-+
-+ my $module_lookup_table = build_modulegids_table($modulesref, $itemname);
-
-- for ( my $i = 0; $i <= $#{$itemsref}; $i++ )
-+ for my $oneitem (@{$itemsref})
- {
-- my $oneitem = ${$itemsref}[$i];
- my $itemgid = $oneitem->{'gid'};
-
- my $styles = "";
-@@ -2431,7 +2469,7 @@ sub assigning_modules_to_items
-
- # every item can belong to many modules
-
-- my ($modulegids, $haslanguagemodule) = get_string_of_modulegids_for_itemgid($modulesref, $itemgid, $itemname);
-+ my ($modulegids, $haslanguagemodule) = get_string_of_modulegids_for_itemgid($module_lookup_table,$modulesref, $itemgid, $itemname);
-
- if ($modulegids eq "")
- {
commit 27ef2366308773c94dd5f8a0d92aabaddc6875e2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 14:19:24 2009 +0300
Update for dev300-m54.
* patches/dev300/sfx2-check-existing-template-dirs.diff: Update for
dev300-m54 so that it applies. No idea whether patch as such longer
works.
diff --git a/patches/dev300/sfx2-check-existing-template-dirs.diff b/patches/dev300/sfx2-check-existing-template-dirs.diff
index 287534d..b0e72f6 100644
--- a/patches/dev300/sfx2-check-existing-template-dirs.diff
+++ b/patches/dev300/sfx2-check-existing-template-dirs.diff
@@ -8,24 +8,17 @@
#ifndef _SV_RESARY_HXX
#include <tools/resary.hxx>
#endif
-@@ -1218,17 +1219,22 @@ void SfxDocTplService_Impl::doUpdate()
- OUString* pDirs = maTemplateDirs.getArray();
- Content aDirContent;
-
-- // the last directory in the list must be writable
-- sal_Bool bWriteableDirectory = sal_True;
-+ // the last directory in the list must be writable
-+ sal_Bool bWriteableDirectory = sal_True;
+@@ -1218,12 +1219,17 @@ void SfxDocTplService_Impl::doUpdate()
while ( nCountDir )
{
nCountDir--;
-- if ( Content::create( pDirs[ nCountDir ], maCmdEnv, aDirContent ) )
+- if ( Content::create( pDirs[ nCountDir ], aQuietEnv, aDirContent ) )
+ osl::Directory aDirectory (pDirs[ nCountDir ]);
+ osl::FileBase::RC nError = aDirectory.open();
+ if (nError == osl::FileBase::E_None || bWriteableDirectory)
{
- createFromContent( aGroupList, aDirContent, sal_False, bWriteableDirectory );
-+ if ( Content::create( pDirs[ nCountDir ], maCmdEnv, aDirContent ) )
++ if ( Content::create( pDirs[ nCountDir ], aQuietEnv, aDirContent ) )
+ {
+ createFromContent( aGroupList, aDirContent, sal_False, bWriteableDirectory );
+ }
commit 60ef7a3dc3f6b454f5fd5d835fde4d7671e1bbaf
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 13:47:47 2009 +0300
Update for dev300-m54.
* patches/dev300/padmin-nofontconfig.diff: Make patch to
padmin/source/padialog.cxx apply. No idea whether it compiles or
makes sense in general yet.
diff --git a/patches/dev300/padmin-nofontconfig.diff b/patches/dev300/padmin-nofontconfig.diff
index 52c909a..accaa3b 100644
--- a/patches/dev300/padmin-nofontconfig.diff
+++ b/patches/dev300/padmin-nofontconfig.diff
@@ -28,23 +28,18 @@
$(OBJ)/pamain.obj
--- padmin/source/padialog.cxx.old 2009-04-02 11:01:37.000000000 +0000
+++ padmin/source/padialog.cxx 2009-04-06 16:41:45.000000000 +0000
-@@ -42,14 +42,13 @@
- #include <vcl/event.hxx>
- #include <tools/stream.hxx>
- #include <tools/color.hxx>
--#ifndef _PAD_PADIALOG_HRC_
-+#include <tools/urlobj.hxx>
+@@ -42,7 +42,11 @@
+ #include <string.h>
+ #include <math.h>
+
++#include "tools/urlobj.hxx"
++
+#ifndef FONTCONFIG_FONTS
- #include <padialog.hrc>
- #endif
- #include <fontentry.hxx>
- #include <helper.hxx>
--#ifndef _PSP_PRINTERINFOMANAGER_HXX_
- #include <psprint/printerinfomanager.hxx>
--#endif
- #include <padialog.hxx>
- #include <adddlg.hxx>
- #include <prtsetup.hxx>
+ #include "padialog.hrc"
++#endif
+ #include "fontentry.hxx"
+ #include "helper.hxx"
+ #include "padialog.hxx"
@@ -93,7 +92,9 @@ PADialog::PADialog( Window* pParent, BOO
m_aCUPSCB( this, PaResId( RID_PA_CB_CUPSUSAGE ) ),
m_aSepButtonFL( this, PaResId( RID_PA_FL_SEPBUTTON ) ),
commit 51078cf294591a0bd477bbd8e211b18d1efc9673
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 13:22:43 2009 +0300
Update for dev300-m54.
* patches/dev300/svx-honour-customshape-capabilities.diff: The first
hunk of the patch to svx/source/svdraw/svdoashp.cxx is already
upstream.
diff --git a/patches/dev300/svx-honour-customshape-capabilities.diff b/patches/dev300/svx-honour-customshape-capabilities.diff
index 88ddec6..012def2 100644
--- a/patches/dev300/svx-honour-customshape-capabilities.diff
+++ b/patches/dev300/svx-honour-customshape-capabilities.diff
@@ -1,16 +1,5 @@
--- svx/source/svdraw/svdoashp.orig 2008-07-22 23:22:38.000000000 +0200
+++ svx/source/svdraw/svdoashp.cxx 2008-07-22 23:25:49.000000000 +0200
-@@ -1660,8 +1660,8 @@
- rInfo.bMirror90Allowed =TRUE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
-- rInfo.bShearAllowed =FALSE;
-- rInfo.bEdgeRadiusAllowed=FALSE;
-+ rInfo.bShearAllowed =TRUE;
-+ rInfo.bEdgeRadiusAllowed=TRUE;
- rInfo.bNoContortion =TRUE;
-
- // #i37011#
@@ -1698,6 +1698,11 @@
{
rInfo.bCanConvToContour = aInfo.bCanConvToContour;
commit 1d6fca018cb35932c52423fea5052aa9898e0961
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 13:17:14 2009 +0300
ucb-neon-different-name.diff is upstream.
* patches/dev300/ucb-neon-different-name.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index b209d94..11fca44 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -387,10 +387,6 @@ buildfix-fmtargs.diff, cabral
# more intelligent nsplugin seeking
nsplugin-path.diff, i#49590, michael
-# some versions of neon report DAV:Collection instead of Collection
-# thanks Caolan for the fix
-ucb-neon-different-name.diff, i#98288, pmladek
-
# sd printing fixes
printing-bugfix-254573.diff, n#254573, rodo
diff --git a/patches/dev300/ucb-neon-different-name.diff b/patches/dev300/ucb-neon-different-name.diff
deleted file mode 100644
index deb94d2..0000000
--- a/patches/dev300/ucb-neon-different-name.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git ucb/source/ucp/webdav/NeonPropFindRequest.cxx ucb/source/ucp/webdav/NeonPropFindRequest.cxx
-index ae9f022..33b0cbc 100644
---- ucb/source/ucp/webdav/NeonPropFindRequest.cxx
-+++ ucb/source/ucp/webdav/NeonPropFindRequest.cxx
-@@ -103,8 +103,12 @@ extern "C" int NPFR_propfind_iter( void* userdata,
- if ( aValue.getLength() )
- {
- aValue = aValue.toAsciiLowerCase();
-- if ( aValue.compareTo(
-- RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
-+ if (
-+ ( aValue.compareTo(
-+ RTL_CONSTASCII_STRINGPARAM( "<collection" ) ) == 0 ) ||
-+ ( aValue.compareTo(
-+ RTL_CONSTASCII_STRINGPARAM( "<dav:collection" ) ) == 0 )
-+ )
- {
- thePropertyValue.Value
- <<= OUString::createFromAscii( "collection" );
commit b1a95dd5252b704fb1cf7da46a81b733881b73e9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 13:12:53 2009 +0300
Update for dev300-m54.
* patches/dev300/buildfix-fmtargs.diff: Patch for
idl/source/prj/command.cxx is already upstream. Slight adaptation
needed for patch for icc/makefile.mk.
diff --git a/patches/dev300/buildfix-fmtargs.diff b/patches/dev300/buildfix-fmtargs.diff
index 16cc665..130af2b 100644
--- a/patches/dev300/buildfix-fmtargs.diff
+++ b/patches/dev300/buildfix-fmtargs.diff
@@ -9,28 +9,8 @@
#endif
pString = pInputList->First();
---- idl/source/prj/command.cxx 2008-05-20 15:03:35.000000000 -0400
-+++ idl/source/prj/command.cxx 2009-01-13 13:58:16.000000000 -0500
-@@ -351,7 +351,7 @@
- }
- else if( aParam.EqualsIgnoreCaseAscii( "help" ) || aParam.EqualsIgnoreCaseAscii( "?" ) )
- { // Hilfe
-- printf( CommandLineSyntax );
-+ printf( "%s", CommandLineSyntax );
- }
- else if( aParam.EqualsIgnoreCaseAscii( "syntax" ) )
- { // Hilfe
-@@ -391,7 +391,7 @@
- }
- else
- {
-- printf( CommandLineSyntax );
-+ printf( "%s", CommandLineSyntax );
- }
-
- String * pStr = aList.First();
---- psprint/source/fontsubset/sft.c 2008-06-25 10:20:29.000000000 -0400
-+++ psprint/source/fontsubset/sft.c 2009-01-13 14:07:50.000000000 -0500
+--- vcl/source/fontsubset/sft.cxx
++++ vcl/source/fontsubset/sft.cxx
@@ -2044,7 +2044,7 @@
fprintf(outf, h02, modname, modver, modextra);
fprintf(outf, h09, ttf->psname);
@@ -194,18 +174,14 @@ diff -p -up ./icc/mdv-fmtargs-buildfix.patch.orig0 ./icc/mdv-fmtargs-buildfix.pa
+ sReport += icValidateNonCompliantMsg;
+ sReport += buf;
+
-diff -p -up icc/makefile.mk.orig0 ./icc/makefile.mk.
-diff: icc/makefile.mk.: Arquivo ou diretório não encontrado
-[cabral at build1 ooo300-m14]$ gendiff . .orig0
-diff -p -up ./icc/makefile.mk.orig0 ./icc/makefile.mk
---- icc/makefile.mk.orig0 2009-01-20 15:42:20.000000000 -0500
-+++ icc/makefile.mk 2009-01-20 15:42:49.000000000 -0500
+--- icc/makefile.mk.orig0
++++ icc/makefile.mk
@@ -54,7 +54,7 @@ CONVERTFILES= \
- Contrib$/ICC_utils$/Stubs.h \
- Contrib$/ICC_utils$/Vetters.cpp
-
+ Contrib$/ICC_utils$/Stubs.h \
+ Contrib$/ICC_utils$/Vetters.cpp
+
-CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip
+CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip && patch -p0 < $(BACK_PATH)..$/mdv-fmtargs-buildfix.patch
- BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && .$/create_sRGB_profile
-
+ BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile
+
# --- Targets ------------------------------------------------------
commit d1071fec15775c7675c5a722a5c2f43927ff8dd8
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 10 10:05:45 2009 +0300
Update for dev300-m54.
* patches/dev300/offapi-typecheck-whitelist.diff: Update for dev300-m54.
diff --git a/patches/dev300/offapi-typecheck-whitelist.diff b/patches/dev300/offapi-typecheck-whitelist.diff
index 3a8c035..9659b3b 100644
--- a/patches/dev300/offapi-typecheck-whitelist.diff
+++ b/patches/dev300/offapi-typecheck-whitelist.diff
@@ -17,7 +17,7 @@
# for versioning of UNO cli type libraries
-$(UNOTYPE_STATISTICS) : $(REGISTRYCHECKFLAG)
+$(UNOTYPE_STATISTICS) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db
- $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
+ $(AUGMENT_LIBRARY_PATH) $(PERL) checknewapi.pl $(UCR)$/types.db $(REFERENCE_RDB) "$(RSCREVISION)" > $@
.INCLUDE : target.mk
--- /dev/null 2007-09-21 21:12:45.000000000 +0200
commit 027641a487e6a85bea8807016d3401fff57323d5
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 17:15:53 2009 +0300
Update for dev300-m54.
* patches/dev300/libwpd.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/libwpd.diff b/patches/dev300/libwpd.diff
index ebb1ed5..83593a3 100644
--- a/patches/dev300/libwpd.diff
+++ b/patches/dev300/libwpd.diff
@@ -6,8 +6,8 @@
-TARFILE_NAME=libwpd-0.8.8
+TARFILE_NAME=libwpd-0.8.14
--PATCH_FILE_NAME=$(TARFILE_NAME).diff
-+#PATCH_FILE_NAME=$(TARFILE_NAME).diff
+-PATCH_FILES=$(TARFILE_NAME).diff
++#PATCH_FILES=$(TARFILE_NAME).diff
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/lib
commit f8e317ba7efabd5c9160a2d98022a77b3f7e6b4f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 17:14:01 2009 +0300
Update for dev300-m54.
* patches/dev300/vcl-menu-fixes.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/vcl-menu-fixes.diff b/patches/dev300/vcl-menu-fixes.diff
index 4a72232..319efbc 100644
--- a/patches/dev300/vcl-menu-fixes.diff
+++ b/patches/dev300/vcl-menu-fixes.diff
@@ -31,20 +31,20 @@
if ( aImgSz.Height() > aMaxImgSz.Height() )
aMaxImgSz.Height() = aImgSz.Height();
@@ -2331,7 +2337,7 @@ Size Menu::ImplCalcSize( Window* pWin )
- if ( !bIsMenuBar && pData->HasCheck() )
- {
- nCheckWidth = nMaxCheckWidth;
-- if (nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES)
-+ if ( ( nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES ) || bSpaceForCheckbox )
- nWidth += nCheckWidth + nExtra * 2;
- }
-
+ if ( !bIsMenuBar && pData->HasCheck() )
+ {
+ nCheckWidth = nMaxCheckWidth;
+- if (nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES)
++ if ( ( nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES ) || bSpaceForCheckbox )
+ {
+ // checks / images take the same place
+ if( ! ( ( pData->eType == MENUITEM_IMAGE ) || ( pData->eType == MENUITEM_STRINGIMAGE ) ) )
@@ -2391,7 +2397,7 @@ Size Menu::ImplCalcSize( Window* pWin )
{
USHORT gfxExtra = (USHORT) Max( nExtra, 7L ); // #107710# increase space between checkmarks/images/text
nCheckPos = (USHORT)nExtra;
- if (nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES)
+ if ( ( nMenuFlags & MENU_FLAG_SHOWCHECKIMAGES ) || bSpaceForCheckbox )
- {
- // non-NWF case has an implicit little extra space around
- // the symbol; NWF case has not, so image pos needs to
+ {
+ long nImgOrChkWidth = 0;
+ nImagePos = nCheckPos;
commit c86a4864d64862e880a3f4209aa34421a01dbc92
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 17:10:04 2009 +0300
paragrph.cxx has moved.
* patches/dev300/cjk-character-units-fix-376788.diff:
svx/source/dialog/paragrph.cxx is now in svx/source/cui.
diff --git a/patches/dev300/cjk-character-units-fix-376788.diff b/patches/dev300/cjk-character-units-fix-376788.diff
index abf965c..08f1f19 100644
--- a/patches/dev300/cjk-character-units-fix-376788.diff
+++ b/patches/dev300/cjk-character-units-fix-376788.diff
@@ -116,8 +116,8 @@
pHRuler->SetCharWidth( 371 ); // default character width
pVRuler->SetLineHeight( 551 ); // default line height
---- svx/source/dialog/paragrph.cxx 2008-04-15 15:27:38.000000000 +0800
-+++ svx/source/dialog/paragrph.cxx 2008-04-17 18:11:00.000000000 +0800
+--- svx/source/cui/paragrph.cxx
++++ svx/source/cui/paragrph.cxx
@@ -106,6 +106,9 @@
#include <svtools/eitem.hxx> //add CHINA001
#include <sfx2/request.hxx> //add CHINA001
commit 051dbfc63e82d2e4379089aca4ffc7de105d78df
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 17:05:47 2009 +0300
paragrph.cxx has moved.
* patches/dev300/cjk-character-units-imp.diff:
svx/source/dialog/paragrph.cxx is now in svx/source/cui.
diff --git a/patches/dev300/cjk-character-units-imp.diff b/patches/dev300/cjk-character-units-imp.diff
index 4c3edda..c50ed1f 100644
--- a/patches/dev300/cjk-character-units-imp.diff
+++ b/patches/dev300/cjk-character-units-imp.diff
@@ -175,8 +175,8 @@ diff -purN svx.old/source/dialog/dlgutil.cxx svx/source/dialog/dlgutil.cxx
// -----------------------------------------------------------------------
void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit )
diff -purN svx.old/source/dialog/paragrph.cxx svx/source/dialog/paragrph.cxx
---- svx.old/source/dialog/paragrph.cxx 2009-02-12 14:57:23.000000000 +0100
-+++ svx/source/dialog/paragrph.cxx 2009-02-13 11:11:54.000000000 +0100
+--- svx.old/source/cui/paragrph.cxx
++++ svx/source/cui/paragrph.cxx
@@ -460,11 +460,20 @@ void SvxStdParagraphTabPage::Reset( cons
// Metrik einstellen
commit 9823256b33639ddf2f2f0508bbda7aea58d09bcd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 17:01:58 2009 +0300
Update for dev300-m54.
* patches/dev300/speed-sal-fewer-lstats.diff: Update for dev300-m54.
diff --git a/patches/dev300/speed-sal-fewer-lstats.diff b/patches/dev300/speed-sal-fewer-lstats.diff
index b36b22e..a9b93ac 100644
--- a/patches/dev300/speed-sal-fewer-lstats.diff
+++ b/patches/dev300/speed-sal-fewer-lstats.diff
@@ -2,7 +2,7 @@ diff --git sal/osl/unx/file_url.cxx sal/osl/unx/file_url.cxx
index 1bf4c60..a35c9d8 100644
--- sal/osl/unx/file_url.cxx
+++ sal/osl/unx/file_url.cxx
-@@ -446,306 +446,39 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
+@@ -446,250 +446,38 @@ oslFileError osl_getSystemPathFromFileURL_Ex(
return osl_error;
}
@@ -33,45 +33,14 @@ index 1bf4c60..a35c9d8 100644
+ return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
- ********************************************/
-- sal_Unicode* ustrcpy(const sal_Unicode* s, sal_Unicode* d)
+ if (realpath(unresolved_path, resolved_path))
- {
-- const sal_Unicode* sc = s;
-- sal_Unicode* dc = d;
--
-- while ((*dc++ = *sc++))
-- /**/;
--
-- return d;
-- }
--
-- /*********************************************
++ {
+ sal_Unicode path[PATH_MAX];
+ if (!TextToUnicode(resolved_path, strlen(resolved_path), path, PATH_MAX))
+ return oslTranslateFileError(OSL_FET_ERROR, ENAMETOOLONG);
-
-- ********************************************/
--
-- sal_Unicode* ustrncpy(const sal_Unicode* s, sal_Unicode* d, unsigned int n)
-- {
-- const sal_Unicode* sc = s;
-- sal_Unicode* dc = d;
-- unsigned int i = n;
--
-- while (i--)
-- *dc++ = *sc++;
--
-- if (n)
-- *dc = 0;
--
-- return d;
+ resolved = rtl::OUString(path, rtl_ustr_getLength(path));
+ return osl_File_E_None;
- }
--
-- /*********************************************
--
-- ********************************************/
++ }
-
- sal_Unicode* ustrchrcat(const sal_Unicode chr, sal_Unicode* d)
+ else
@@ -84,17 +53,6 @@ index 1bf4c60..a35c9d8 100644
+ return oslTranslateFileError(OSL_FET_ERROR, errno);
}
-- /*********************************************
--
-- ********************************************/
--
-- sal_Unicode* ustrcat(const sal_Unicode* s, sal_Unicode* d)
-- {
-- sal_Unicode* dc = ustrtoend(d);
-- ustrcpy(s, dc);
-- return d;
-- }
--
- /******************************************************
- *
- ******************************************************/
@@ -108,18 +66,6 @@ index 1bf4c60..a35c9d8 100644
- }
-
- /******************************************************
-- * Ensure that the given string has the specified last
-- * character if necessary append it
-- ******************************************************/
--
-- sal_Unicode* _strensurelast(sal_Unicode* pStr, sal_Unicode Chr)
-- {
-- if (!_islastchr(pStr, Chr))
-- ustrchrcat(Chr, pStr);
-- return pStr;
-- }
--
-- /******************************************************
- * Remove the last part of a path, a path that has
- * only a '/' or no '/' at all will be returned
- * unmodified
commit 58e67704917704c0113b29cc78db060656417eb1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:53:00 2009 +0300
solenv/bin/cws-commit-patch is gone.
* patches/dev300/apply: cws-commit-patch-default-dev300.diff patches
solenv/bin/cws-commit-patch which does not exist any more, so move
it to UnUsedButNotYetRemovedFromSVN for now.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d379f06..b209d94 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -247,9 +247,6 @@ quiet-build-more.diff, i#84497, thorsten
# gcc OOMs here otherwise (x86_64)
writerfilter-qnametostr-NOOPTFILES.diff
-# default to DEV300 in cws-commit-patch
-cws-commit-patch-default-dev300.diff, i#87431, jholesov
-
# avoid crash when calling the mono testcase from ooo-build/test/mono
# the object "this" was destroyed after calling ScTableSheetObj::getImplementation
# this hack make sure that the object lives a bit longer
@@ -2306,6 +2303,9 @@ comphelper-msvc8-fix.diff, thorsten, i#89973
# some versions of make don't like us
cygwin-make-ver.diff, i#68283, michael
+# default to DEV300 in cws-commit-patch
+cws-commit-patch-default-dev300.diff, i#87431, jholesov
+
[ Store ]
SectionOwner => rodo
commit 24868c9aaa4e06dd612d802b6de76e66ca47bb5c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:50:51 2009 +0300
speed-lingucomponent.diff seems to be upstream.
* patches/dev300/speed-lingucomponent.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index fc54150..d379f06 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -244,11 +244,6 @@ linkoo-dev300.diff, jholesov
quiet-build.diff, i#84497, michael
quiet-build-more.diff, i#84497, thorsten
-# don't do dumb I/O and CPU work we can defer around lang guessing
-# we should really defer loading the shlib that does this work too but ...
-speed-lingucomponent.diff, i#100757, michael
-
-
# gcc OOMs here otherwise (x86_64)
writerfilter-qnametostr-NOOPTFILES.diff
diff --git a/patches/dev300/speed-lingucomponent.diff b/patches/dev300/speed-lingucomponent.diff
deleted file mode 100644
index e14e541..0000000
--- a/patches/dev300/speed-lingucomponent.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -u -r ../../svn-HEAD/build/ooo310-m4/lingucomponent/source/languageguessing/guesslang.cxx ../lingucomponent/source/languageguessing/guesslang.cxx
---- lingucomponent/source/languageguessing/guesslang.cxx
-+++ lingucomponent/source/languageguessing/guesslang.cxx
-@@ -97,11 +97,13 @@
- XServiceInfo >
- {
- SimpleGuesser guesser;
-+ bool m_bInitialized;
- css::uno::Reference< css::uno::XComponentContext > m_xContext;
-
- LangGuess_Impl(const LangGuess_Impl &); // not defined
- void operator =(const LangGuess_Impl &); // not defined
- virtual ~LangGuess_Impl() {}
-+ void ensureInitialized();
-
- public:
- explicit LangGuess_Impl(css::uno::Reference< css::uno::XComponentContext > const & context);
-@@ -130,8 +132,17 @@
- //*************************************************************************
-
- LangGuess_Impl::LangGuess_Impl(css::uno::Reference< css::uno::XComponentContext > const & context) :
-+ m_bInitialized(false),
- m_xContext(context)
- {
-+}
-+
-+void LangGuess_Impl::ensureInitialized()
-+{
-+ if (m_bInitialized)
-+ return;
-+ m_bInitialized = true;
-+
- // set default fingerprint path to where those get installed
- String aPhysPath;
- String aURL( SvtPathOptions().GetFingerprintPath() );
-@@ -218,6 +229,8 @@
- {
- osl::MutexGuard aGuard( GetLangGuessMutex() );
-
-+ ensureInitialized();
-+
- lang::Locale aRes;
- if (nStartPos >=0 && nLen >= 0 && nStartPos + nLen <= rText.getLength())
- {
-@@ -256,6 +272,8 @@
- {
- osl::MutexGuard aGuard( GetLangGuessMutex() );
-
-+ ensureInitialized();
-+
- Sequence< com::sun::star::lang::Locale > aRes;
- vector<Guess> gs = guesser.GetAllManagedLanguages();
- aRes.realloc(gs.size());
-@@ -278,6 +297,8 @@
- {
- osl::MutexGuard aGuard( GetLangGuessMutex() );
-
-+ ensureInitialized();
-+
- Sequence< com::sun::star::lang::Locale > aRes;
- vector<Guess> gs = guesser.GetAvailableLanguages();
- aRes.realloc(gs.size());
-@@ -300,6 +322,8 @@
- {
- osl::MutexGuard aGuard( GetLangGuessMutex() );
-
-+ ensureInitialized();
-+
- Sequence< com::sun::star::lang::Locale > aRes;
- vector<Guess> gs = guesser.GetUnavailableLanguages();
- aRes.realloc(gs.size());
-@@ -323,6 +348,8 @@
- {
- osl::MutexGuard aGuard( GetLangGuessMutex() );
-
-+ ensureInitialized();
-+
- sal_Int32 nLanguages = rLanguages.getLength();
- const Locale *pLanguages = rLanguages.getConstArray();
-
-@@ -347,6 +375,8 @@
- {
- osl::MutexGuard aGuard( GetLangGuessMutex() );
-
-+ ensureInitialized();
-+
- sal_Int32 nLanguages = rLanguages.getLength();
- const Locale *pLanguages = rLanguages.getConstArray();
-
commit 2f387b953666d63e680f47e1c16b3faefb41bdcc
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:41:05 2009 +0300
speed-configmgr-nodesort.diff is upstream.
* patches/dev300/speed-configmgr-nodesort.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5d75f97..fc54150 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -244,8 +244,6 @@ linkoo-dev300.diff, jholesov
quiet-build.diff, i#84497, michael
quiet-build-more.diff, i#84497, thorsten
-# sort by a simple metric first
-speed-configmgr-nodesort.diff, i#100743, michael
# don't do dumb I/O and CPU work we can defer around lang guessing
# we should really defer loading the shlib that does this work too but ...
speed-lingucomponent.diff, i#100757, michael
diff --git a/patches/dev300/speed-configmgr-nodesort.diff b/patches/dev300/speed-configmgr-nodesort.diff
deleted file mode 100644
index f731c55..0000000
--- a/patches/dev300/speed-configmgr-nodesort.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u -r ../HEAD/build/ooo310-m4/configmgr/source/treemgr/setnodeimpl.hxx configmgr/source/treemgr/setnodeimpl.hxx
---- configmgr/source/treemgr/setnodeimpl.hxx
-+++ configmgr/source/treemgr/setnodeimpl.hxx
-@@ -106,10 +106,21 @@
- };
- //-----------------------------------------------------------------------------
-
-+ struct ElementTreeCompare
-+ {
-+ bool operator()(const rtl::OUString &a, const rtl::OUString &b) const
-+ { // first sort by length - order is immaterial, and it is fast.
-+ if (a.getLength() == b.getLength())
-+ return a < b;
-+ else
-+ return a.getLength() < b.getLength();
-+ }
-+ };
-+
- class ElementSet
- {
- public:
-- typedef std::map<rtl::OUString, ElementTreeData> Data;
-+ typedef std::map<rtl::OUString, ElementTreeData,ElementTreeCompare> Data;
-
- // the following must be implemented by derived classes
- bool isEmpty() const { return m_aData.empty(); }
commit d53fa0f478d680233f224baeb4239aabe89f02e7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:36:45 2009 +0300
Make dev300-m54 the default tag.
* configure.in: Make dev300-m54 the default tag.
diff --git a/configure.in b/configure.in
index 1445898..2095e31 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.51)
AC_CONFIG_SRCDIR(bin/build-ooo)
AC_PREFIX_DEFAULT(/usr)
-DEFAULT_TAG=ooo310-m17
+DEFAULT_TAG=dev300-m54
# For the upstream packages it is like:
# DEFAULT_TAG=OOO310_m1
commit 3f5ac16de3f3b880b99c80077e750a9826e8e99c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:35:39 2009 +0300
speed-configmgr-misc.diff is upstream.
* patches/dev300/speed-configmgr-misc.diff: Delete.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0f745d5..5d75f97 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -244,8 +244,6 @@ linkoo-dev300.diff, jholesov
quiet-build.diff, i#84497, michael
quiet-build-more.diff, i#84497, thorsten
-# further performance tweaks to configmgr
-speed-configmgr-misc.diff, i#84751, michael
# sort by a simple metric first
speed-configmgr-nodesort.diff, i#100743, michael
# don't do dumb I/O and CPU work we can defer around lang guessing
diff --git a/patches/dev300/speed-configmgr-misc.diff b/patches/dev300/speed-configmgr-misc.diff
deleted file mode 100644
index 1df2f67..0000000
--- a/patches/dev300/speed-configmgr-misc.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u -r ../configmgr.pristine/source/backend/binaryreader.cxx ../configmgr/source/backend/binaryreader.cxx
---- configmgr/source/backend/binaryreader.cxx
-+++ configmgr/source/backend/binaryreader.cxx
-@@ -532,10 +532,10 @@
-
- // --------------------------------------------------------------------------
-
-- inline uno::Reference<io::XDataInputStream> BinaryReader::getDataInputStream()
-+ inline BinaryReader_Impl * BinaryReader::getDataInputStream()
- {
- OSL_ENSURE(m_xDataInputStream.is(),"Binary Cache: Reader was not opened - no input stream");
-- return m_xDataInputStream;
-+ return static_cast<BinaryReader_Impl *>(m_xDataInputStream.get());
- }
-
- // --------------------------------------------------------------------------
-
-
-diff -u -r ../configmgr.pristine/source/backend/binaryreader.hxx ../configmgr/source/backend/binaryreader.hxx
---- configmgr/source/backend/binaryreader.hxx
-+++ configmgr/source/backend/binaryreader.hxx
-@@ -48,6 +48,7 @@
- namespace uno = css::uno;
- namespace lang = css::lang;
- // -----------------------------------------------------------------------------
-+ class BinaryReader_Impl;
- class BinaryReader
- {
- rtl::OUString m_sFileURL;
-@@ -75,7 +76,7 @@
- void read(uno::Sequence< rtl::OUString > &_aValue) SAL_THROW( (io::IOException, uno::RuntimeException) );
-
- private:
-- inline uno::Reference<io::XDataInputStream> getDataInputStream();
-+ inline BinaryReader_Impl * getDataInputStream();
- };
- // --------------------------------------------------------------------------
-
-
-
-diff -u -r ../configmgr.pristine/source/tree/cmtree.cxx ../configmgr/source/tree/cmtree.cxx
---- configmgr/source/tree/cmtree.cxx
-+++ configmgr/source/tree/cmtree.cxx
-@@ -65,13 +65,11 @@
-
- // ------------------------ ChildListSet implementations ------------------------
- ChildListSet::ChildListSet(ChildListSet const& aSet, treeop::DeepChildCopy)
-- : m_aChildList(0)
-+ : m_aChildList(aSet.m_aChildList.size())
- {
-- for (size_t i = 0; i < aSet.m_aChildList.size(); i++)
-- {
-- m_aChildList.insert(m_aChildList.end(),
-- aSet.m_aChildList[i]->clone().release());
-- }
-+ int len = aSet.m_aChildList.size();
-+ for (int i = 0; i < len; i++)
-+ m_aChildList[i] = aSet.m_aChildList[i]->clone().release();
- }
- ChildListSet::~ChildListSet()
- {
commit daaf40112cc43ee643c5f805a8d36eb6b6a92382
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:21:50 2009 +0300
Update for dev300-m54.
* patches/dev300/quiet-build-more.diff
* patches/dev300/quiet-build.diff
* patches/dev300/sc-dataform-sc.diff: Update for dev300-m54.
diff --git a/patches/dev300/quiet-build-more.diff b/patches/dev300/quiet-build-more.diff
index afc1a54..4191389 100644
--- a/patches/dev300/quiet-build-more.diff
+++ b/patches/dev300/quiet-build-more.diff
@@ -392,11 +392,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL1NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) -- -s $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL1NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -415,11 +415,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL2NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) -- -s $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL2NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -438,11 +438,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL3NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) -- -s $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL3NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -461,11 +461,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL4NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) -- -s $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL4NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -484,11 +484,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL5NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) -- -s $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL5NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -507,11 +507,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL6NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) -- -s $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL6NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -530,11 +530,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL7NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) -- -s $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL7NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -553,11 +553,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL8NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) -- -s $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL8NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -576,11 +576,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL9NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) -- -s $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL9NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -599,11 +599,11 @@ index a9f08dc..19afa21 100644
.IF "$(SHL10NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) -- -s $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL10NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
@@ -659,11 +659,11 @@ index 489ba05..98b2040 100644
.IF "$(SHL$(TNR)NOCHECK)"==""
$(QUIET_BUILD) -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
$(QUIET_BUILD) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+- $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+.IF "$(QUIET_BUILD)"==""
-+ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
++ $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+.ELSE
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) -- -s $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+.ENDIF
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
diff --git a/patches/dev300/quiet-build.diff b/patches/dev300/quiet-build.diff
index cc586c7..3e58715 100644
--- a/patches/dev300/quiet-build.diff
+++ b/patches/dev300/quiet-build.diff
@@ -1634,15 +1634,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -233,7 +237,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL1TARGET8=$(shell @fix_shl.cmd $(SHL1TARGET))
-+SHL1TARGET8=$(shell @fix_shl $(SHL1TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -254,8 +258,10 @@ $(SHL1TARGETN) : \
$(SHL1DEPN) \
$(SHL1IMP_ORD) \
@@ -1682,10 +1673,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL1NOCHECK)"==""
- -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
- $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL1TARGETN) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS1) $(SHL1TARGETN:d)check_$(SHL1TARGETN:f)
.ENDIF # "$(SHL1NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -1743,15 +1734,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -773,7 +785,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL2TARGET8=$(shell @fix_shl.cmd $(SHL2TARGET))
-+SHL2TARGET8=$(shell @fix_shl $(SHL2TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -794,8 +806,10 @@ $(SHL2TARGETN) : \
$(SHL2DEPN) \
$(SHL2IMP_ORD) \
@@ -1791,10 +1773,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL2NOCHECK)"==""
- -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
- $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL2TARGETN) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS2) $(SHL2TARGETN:d)check_$(SHL2TARGETN:f)
.ENDIF # "$(SHL2NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -1852,15 +1834,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -1313,7 +1333,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL3TARGET8=$(shell @fix_shl.cmd $(SHL3TARGET))
-+SHL3TARGET8=$(shell @fix_shl $(SHL3TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -1334,8 +1354,10 @@ $(SHL3TARGETN) : \
$(SHL3DEPN) \
$(SHL3IMP_ORD) \
@@ -1900,10 +1873,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL3NOCHECK)"==""
- -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
- $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL3TARGETN) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS3) $(SHL3TARGETN:d)check_$(SHL3TARGETN:f)
.ENDIF # "$(SHL3NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -1961,15 +1934,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -1853,7 +1881,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL4TARGET8=$(shell @fix_shl.cmd $(SHL4TARGET))
-+SHL4TARGET8=$(shell @fix_shl $(SHL4TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -1874,8 +1902,10 @@ $(SHL4TARGETN) : \
$(SHL4DEPN) \
$(SHL4IMP_ORD) \
@@ -2009,10 +1973,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL4NOCHECK)"==""
- -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
- $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL4TARGETN) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS4) $(SHL4TARGETN:d)check_$(SHL4TARGETN:f)
.ENDIF # "$(SHL4NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2070,15 +2034,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -2393,7 +2429,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL5TARGET8=$(shell @fix_shl.cmd $(SHL5TARGET))
-+SHL5TARGET8=$(shell @fix_shl $(SHL5TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -2414,8 +2450,10 @@ $(SHL5TARGETN) : \
$(SHL5DEPN) \
$(SHL5IMP_ORD) \
@@ -2118,10 +2073,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL5NOCHECK)"==""
- -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
- $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL5TARGETN) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS5) $(SHL5TARGETN:d)check_$(SHL5TARGETN:f)
.ENDIF # "$(SHL5NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2179,15 +2134,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -2933,7 +2977,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL6TARGET8=$(shell @fix_shl.cmd $(SHL6TARGET))
-+SHL6TARGET8=$(shell @fix_shl $(SHL6TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -2954,8 +2998,10 @@ $(SHL6TARGETN) : \
$(SHL6DEPN) \
$(SHL6IMP_ORD) \
@@ -2227,10 +2173,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL6NOCHECK)"==""
- -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
- $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL6TARGETN) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS6) $(SHL6TARGETN:d)check_$(SHL6TARGETN:f)
.ENDIF # "$(SHL6NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2288,15 +2234,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -3473,7 +3525,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL7TARGET8=$(shell @fix_shl.cmd $(SHL7TARGET))
-+SHL7TARGET8=$(shell @fix_shl $(SHL7TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -3494,8 +3546,10 @@ $(SHL7TARGETN) : \
$(SHL7DEPN) \
$(SHL7IMP_ORD) \
@@ -2336,10 +2273,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL7NOCHECK)"==""
- -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
- $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL7TARGETN) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS7) $(SHL7TARGETN:d)check_$(SHL7TARGETN:f)
.ENDIF # "$(SHL7NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2397,15 +2334,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -4013,7 +4073,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL8TARGET8=$(shell @fix_shl.cmd $(SHL8TARGET))
-+SHL8TARGET8=$(shell @fix_shl $(SHL8TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -4034,8 +4094,10 @@ $(SHL8TARGETN) : \
$(SHL8DEPN) \
$(SHL8IMP_ORD) \
@@ -2445,10 +2373,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL8NOCHECK)"==""
- -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
- $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL8TARGETN) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS8) $(SHL8TARGETN:d)check_$(SHL8TARGETN:f)
.ENDIF # "$(SHL8NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2506,15 +2434,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -4553,7 +4621,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL9TARGET8=$(shell @fix_shl.cmd $(SHL9TARGET))
-+SHL9TARGET8=$(shell @fix_shl $(SHL9TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -4574,8 +4642,10 @@ $(SHL9TARGETN) : \
$(SHL9DEPN) \
$(SHL9IMP_ORD) \
@@ -2554,10 +2473,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL9NOCHECK)"==""
- -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
- $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL9TARGETN) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS9) $(SHL9TARGETN:d)check_$(SHL9TARGETN:f)
.ENDIF # "$(SHL9NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2615,15 +2534,6 @@ index fbab56a..a9f08dc 100644
.ENDIF # "$(COMID)"=="gcc3"
@chmod a+w $@
# Mac OS X post-processing generate an exported symbols list from the generated map file
-@@ -5093,7 +5169,7 @@ $(MISC)$/%linkinc.ls:
- .IF "$(GUI)" == "OS2"
- #21/02/2006 YD dll names must be 8.3, invoke fix script
- #check osl/os2/module.c/osl_loadModule()
--SHL10TARGET8=$(shell @fix_shl.cmd $(SHL10TARGET))
-+SHL10TARGET8=$(shell @fix_shl $(SHL10TARGET))
- .ENDIF
-
- .IF "$(GUI)" == "OS2"
@@ -5114,8 +5190,10 @@ $(SHL10TARGETN) : \
$(SHL10DEPN) \
$(SHL10IMP_ORD) \
@@ -2663,10 +2573,10 @@ index fbab56a..a9f08dc 100644
.IF "$(SHL10NOCHECK)"==""
- -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
- $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL10TARGETN) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS10) $(SHL10TARGETN:d)check_$(SHL10TARGETN:f)
.ENDIF # "$(SHL10NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -2817,8 +2727,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS1PARTICLE)
-@@ -16,34 +18,53 @@ ALLTAR : $(HIDSRS1PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -16,38 +18,57 @@ ALLTAR : $(HIDSRS1PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -2831,23 +2741,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ -p=$(TARGET) $(SRC1FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS1NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
@@ -2896,8 +2810,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS2PARTICLE)
-@@ -65,34 +88,53 @@ ALLTAR : $(HIDSRS2PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -65,38 +88,57 @@ ALLTAR : $(HIDSRS2PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -2910,23 +2824,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ -p=$(TARGET) $(SRC2FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS2NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
@@ -2975,8 +2893,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS3PARTICLE)
-@@ -114,34 +158,53 @@ ALLTAR : $(HIDSRS3PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -114,38 +158,57 @@ ALLTAR : $(HIDSRS3PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -2989,23 +2907,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ -p=$(TARGET) $(SRC3FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS3NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
@@ -3054,8 +2976,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS4PARTICLE)
-@@ -163,34 +228,53 @@ ALLTAR : $(HIDSRS4PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -163,38 +228,57 @@ ALLTAR : $(HIDSRS4PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3068,13 +2990,15 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ -p=$(TARGET) $(SRC4FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
@@ -3085,6 +3009,8 @@ index 756d3b7..acccc72 100644
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS4NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
@@ -3133,8 +3059,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS5PARTICLE)
-@@ -212,34 +298,53 @@ ALLTAR : $(HIDSRS5PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -212,38 +298,57 @@ ALLTAR : $(HIDSRS5PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3147,23 +3073,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ -p=$(TARGET) $(SRC5FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS5NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
@@ -3212,8 +3142,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS6PARTICLE)
-@@ -261,34 +368,53 @@ ALLTAR : $(HIDSRS6PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -261,38 +368,57 @@ ALLTAR : $(HIDSRS6PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3226,23 +3156,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ -p=$(TARGET) $(SRC6FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS6NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
@@ -3291,8 +3225,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS7PARTICLE)
-@@ -310,34 +438,53 @@ ALLTAR : $(HIDSRS7PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -310,38 +438,57 @@ ALLTAR : $(HIDSRS7PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3305,23 +3239,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ -p=$(TARGET) $(SRC7FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS7NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
@@ -3370,8 +3308,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS8PARTICLE)
-@@ -359,34 +508,53 @@ ALLTAR : $(HIDSRS8PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -359,38 +508,57 @@ ALLTAR : $(HIDSRS8PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3384,23 +3322,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ -p=$(TARGET) $(SRC8FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS8NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
@@ -3449,8 +3391,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS9PARTICLE)
-@@ -408,34 +578,53 @@ ALLTAR : $(HIDSRS9PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -408,38 +578,57 @@ ALLTAR : $(HIDSRS9PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3463,23 +3405,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ -p=$(TARGET) $(SRC9FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS9NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
@@ -3528,8 +3474,8 @@ index 756d3b7..acccc72 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS10PARTICLE)
-@@ -457,34 +648,53 @@ ALLTAR : $(HIDSRS10PARTICLE)
- .ENDIF # "$(BUILDHIDS)"!=""
+@@ -457,38 +648,57 @@ ALLTAR : $(HIDSRS10PARTICLE)
+ $(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(LOCALIZE_ME_DEST)
$(MISC)$/$(TARGET).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
+.IF "$(QUIET_BUILD)"==""
@@ -3542,23 +3488,27 @@ index 756d3b7..acccc72 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ -p=$(TARGET) $(SRC10FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS10NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
@@ -3788,9 +3738,8 @@ index 26ebe9f..5a385f3 100644
$(OBJ)$/%.obj : %.cxx
+.IF "$(QUIET_BUILD)"==""
@echo ------------------------------
-- @echo Making: $@
+.ENDIF
-+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx
@@ -3817,9 +3766,8 @@ index 26ebe9f..5a385f3 100644
$(OBJ)$/%.obj : %.cpp
+.IF "$(QUIET_BUILD)"==""
@echo ------------------------------
-- @echo Making: $@
+.ENDIF
-+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cpp
@@ -3844,9 +3792,8 @@ index 26ebe9f..5a385f3 100644
$(OBJ)$/%.obj : %.cc
+.IF "$(QUIET_BUILD)"==""
@echo ------------------------------
-- @echo Making: $@
+.ENDIF
-+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
.IF "$(GUI)"=="UNX"
@$(RM) $@ $(@:s/.obj/.o/)
- $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)$/$*.o $(CFLAGSINCXX)$(PWD)$/$*.cc
@@ -3859,18 +3806,16 @@ index 26ebe9f..5a385f3 100644
.ELSE
@@$(RM) $@
.IF "$(COM)"=="GCC"
-@@ -162,8 +168,10 @@ $(SLO)$/precompiled_ex.% .PHONY:
+@@ -162,7 +168,9 @@ $(SLO)$/precompiled_ex.% .PHONY:
.ENDIF # "$(ENABLE_PCH)"!=""
$(SLO)$/%.obj : %.cxx
+.IF "$(QUIET_BUILD)"==""
@echo ------------------------------
-- @echo Making: $@
+.ENDIF
-+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
.IF "$(ENABLE_PCH)"!="" && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
# just a helper var
- @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
@@ -181,11 +189,11 @@ $(SLO)$/%.obj : %.cxx
$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) -E $(CFLAGSINCXX)$(PWD)$/$*.cxx
.ELSE
@@ -4402,10 +4347,10 @@ index 26ebe9f..5a385f3 100644
+.IF "$(QUIET_BUILD)"==""
@echo ------------------------------
- @echo Making hid $@
-- $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
+- $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
+.ENDIF
+ @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(*:f).src
-+ $(QUIET_BUILD) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
++ $(QUIET_BUILD) $(AUGMENT_LIBRARY_PATH) $(PERL) $(SOLARENV)$/bin$/mhids.pl $*.src $(SRS) $(PRJNAME) $(CDEFS) $(INCLUDE)
# make *.xml descriptions available in $(MISC)
$(MISC)$/%$($(WINVERSIONNAMES)_MAJOR).xml : %.xml
@@ -4538,7 +4483,7 @@ index 01633b7..635da62 100644
#temporary workaround for non-existing delzip in extras
-@@ -1998,11 +2023,13 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
+@@ -1998,10 +2023,12 @@ UNOUCRDEPxxx : $(UNOUCRDEP);
#new hid.lst trigger with GEN_HID2=TRUE
$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))$/hid.lst .PHONY :
@@ -4547,13 +4492,12 @@ index 01633b7..635da62 100644
+.IF "$(QUIET_BUILD)"==""
@echo ---------------
+.ENDIF
- @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
@echo $(WORK_STAMP).$(LAST_MINOR) 010101010101010 > $@.$(ROUT).tmp
-- $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | $(SORT) -u >> $@.$(ROUT).tmp
-+ $(QUIET_BUILD) $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | $(SORT) -u >> $@.$(ROUT).tmp
- @$(RENAME) $@.$(ROUT).tmp $@
-
-
+- $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
++ $(QUIET_BUILD) $(TYPE) $(SOLARCOMMONBINDIR)$/hid$/*.hid | tr -d "\015" | $(SORT) -u >> $@.$(ROUT).tmp
+ @$(IFEXIST) $@ $(THEN) $(RM:s/+//) $@ $(FI)
+ @-$(RENAME) $@.$(ROUT).tmp $@
+ @-mkdir $(@:d)hid
diff --git solenv/inc/tg_app.mk solenv/inc/tg_app.mk
index 02a0014..386d147 100644
--- solenv/inc/tg_app.mk
@@ -4924,10 +4868,10 @@ index fb8457d..489ba05 100644
.IF "$(SHL$(TNR)NOCHECK)"==""
- -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
- $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+- $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+ $(QUIET_BUILD) -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
+ $(QUIET_BUILD) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
-+ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
++ $(QUIET_BUILD) $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS$(TNR)) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f)
.ENDIF # "$(SHL$(TNR)NOCHECK)"!=""
.ENDIF # "$(UPDATER)"=="YES"
.ENDIF # "$(OS)"=="MACOSX"
@@ -5016,9 +4960,11 @@ index 57dd6c1..dc686d4 100644
@$(RENAME) $@.$(ROUT).tmp $@
ALLTAR : $(HIDSRS$(TNR)PARTICLE)
-@@ -48,34 +50,53 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
+@@ -48,40 +50,59 @@ ALLTAR : $(HIDSRS$(TNR)PARTICLE)
.ENDIF # "$(BUILDHIDS)"!=""
+ $(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(LOCALIZE_ME_DEST)
+
$(MISC)$/$(TARGET).$(SRS$(TNR)NAME).dprr: $(SRC$(TNR)FILES) $(HIDSRS$(TNR)PARTICLE) $(HID$(TNR)FILES)
+.IF "$(QUIET_BUILD)"==""
@echo ------------------------------
@@ -5030,23 +4976,27 @@ index 57dd6c1..dc686d4 100644
+ $(QUIET_BUILD) $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ) -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS$(TNR)NAME).srs} -fo=$@ -p=$(TARGET) $(SRC$(TNR)FILES)
.IF "$(WITH_LANG)"!=""
- $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf
+
+ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) $(LOCALIZESDF)
- -$(MKDIR) $(@:d)
- -$(RM) $@
+.IF "$(QUIET_BUILD)"==""
+ @-$(MKDIR) $(@:d)
+ @-$(RM) $@
- $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
+ -$(MKDIRHIER) $(SOLARSRC)$/$(PRJNAME)$/common$(PROEXT)$/misc$/$(PRJNAME)
+ $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
- $(RENAME) $@.$(INPATH) $@
- -$(RM) $@.$(INPATH)
+.ELSE
+ @-$(MKDIR) $(@:d) $(PIPEERROR) cat - > /dev/null
+ @-$(RM) $@
-+ @ $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
++ @ $(WRAPCMD) $(TRANSEX) -QQ -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+.ENDIF
+ @$(RENAME) $@.$(INPATH) $@
+ @-$(RM) $@.$(INPATH)
+ $(SRS)$/$(SRS$(TNR)NAME).srs: $(LOCALIZE_ME_DEST)
+
$(SRS)$/$(SRS$(TNR)NAME).srs: $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)$/$(TARGET)$/$i)
.ELSE # "$(WITH_LANG)"!=""
$(SRS)$/$(SRS$(TNR)NAME).srs: $(SRC$(TNR)FILES)
@@ -5146,7 +5096,7 @@ diff --git vcl/unx/source/gdi/makefile.mk vcl/unx/source/gdi/makefile.mk
index 4f2f640..ba1323e 100644
--- vcl/unx/source/gdi/makefile.mk
+++ vcl/unx/source/gdi/makefile.mk
-@@ -109,11 +109,11 @@ ALLTAR : $(MACOSXRC)
+@@ -109,9 +109,9 @@ ALLTAR : $(MACOSXRC)
XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
$(INCCOM)$/rtsname.hxx:
@@ -5158,6 +5108,3 @@ index 4f2f640..ba1323e 100644
$(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx
$(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx
- $(MISC)$/macosxrc.txt : $$(@:f)
-- $(COPY) $< $@
-+ @$(COPY) $< $@
diff --git a/patches/dev300/sc-dataform-sc.diff b/patches/dev300/sc-dataform-sc.diff
index d14ca6b..b904b1c 100644
--- a/patches/dev300/sc-dataform-sc.diff
+++ b/patches/dev300/sc-dataform-sc.diff
@@ -1,24 +1,19 @@
-diff --git sc/inc/document.hxx sc/inc/document.hxx
-index bae5aea..5b3fb82 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
-@@ -880,8 +880,10 @@ public:
- SCCOL nEndCol, SCTAB nEndTab,
+@@ -880,7 +880,7 @@ public:
SCROW nStartRow, SCSIZE nSize,
- ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
+ ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL,
+ const ScMarkData* pTabMark = NULL );
- void DeleteRow( const ScRange& rRange,
-+ //for dataform
-+ SC_DLLPUBLIC void DeleteRow( const ScRange& rRange,
++ SC_DLLPUBLIC void DeleteRow( const ScRange& rRange,
ScDocument* pRefUndoDoc = NULL, BOOL* pUndoOutline = NULL );
-+
BOOL InsertCol( SCROW nStartRow, SCTAB nStartTab,
SCROW nEndRow, SCTAB nEndTab,
- SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc = NULL );
diff --git sc/inc/sc.hrc sc/inc/sc.hrc
index 3bcc4f3..7c62d8d 100644
--- sc/inc/sc.hrc
+++ sc/inc/sc.hrc
-@@ -1647,7 +1647,12 @@
+@@ -1647,6 +1647,11 @@
#define SC_OOO_BUILD_START (SC_DIALOGS_END)
@@ -30,7 +25,6 @@ index 3bcc4f3..7c62d8d 100644
#endif
-
diff --git sc/inc/scabstdlg.hxx sc/inc/scabstdlg.hxx
index 3403c2d..dfdf0ba 100644
--- sc/inc/scabstdlg.hxx
commit 3276bb823dba77971de2efa45e959d6878be118d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:20:18 2009 +0300
Delete unused speed-getfilestatus-dtype.diff.
* patches/dev300/speed-getfilestatus-dtype.diff: Remove.
diff --git a/patches/dev300/speed-getfilestatus-dtype.diff b/patches/dev300/speed-getfilestatus-dtype.diff
deleted file mode 100644
index 4b4d468..0000000
--- a/patches/dev300/speed-getfilestatus-dtype.diff
+++ /dev/null
@@ -1,252 +0,0 @@
---- sal/osl/unx/file.cxx.old 2009-04-02 10:43:46.000000000 +0000
-+++ sal/osl/unx/file.cxx 2009-04-06 16:41:38.000000000 +0000
-@@ -131,6 +131,42 @@ static const sal_Char* MOUNTTAB="/etc/mt
-
- #endif
-
-+#ifdef _DIRENT_HAVE_D_TYPE
-+#include "file_impl.hxx"
-+ oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType )
-+ {
-+ oslDirectoryItemImpl *pItemObject = (oslDirectoryItemImpl*) malloc( sizeof( oslDirectoryItemImpl ) );
-+ pItemObject->RefCount = 1;
-+ pItemObject->bHasType = _bHasDType;
-+ pItemObject->DType = _DType;
-+ pItemObject->ustrFilePath = _ustrFilePath;
-+
-+ return pItemObject;
-+ }
-+
-+ void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem )
-+ {
-+ if( pItem->ustrFilePath ) {
-+ rtl_uString_release( pItem->ustrFilePath );
-+ pItem->ustrFilePath = NULL;
-+ }
-+ free( pItem );
-+ }
-+
-+ void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem )
-+ {
-+ pItem->RefCount ++;
-+ }
-+
-+ void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem )
-+ {
-+ pItem->RefCount --;
-+
-+ if( pItem->RefCount <= 0 )
-+ oslDirectoryItemImpl_Destroy( pItem );
-+ }
-+#endif
-+
- #if OSL_DEBUG_LEVEL > 1
-
- extern void debug_ustring(rtl_uString*);
-@@ -467,8 +503,14 @@ oslFileError SAL_CALL osl_getNextDirecto
- osl_systemPathMakeAbsolutePath(pDirImpl->ustrPath, ustrFileName, &ustrFilePath);
- rtl_uString_release( ustrFileName );
-
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ if(*pItem)
-+ oslDirectoryItemImpl_release( ( oslDirectoryItemImpl* )( *pItem ) );
-+ *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrFilePath, true, pEntry->d_type );
-+#else
- /* use path as directory item */
- *pItem = (oslDirectoryItem) ustrFilePath;
-+#endif
-
- return osl_File_E_None;
- }
-@@ -497,7 +539,11 @@ oslFileError SAL_CALL osl_getDirectoryIt
-
- if (0 == access_u(ustrSystemPath, F_OK))
- {
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ *pItem = (oslDirectoryItem) oslDirectoryItemImpl_CreateNew( ustrSystemPath, false );
-+#else
- *pItem = (oslDirectoryItem)ustrSystemPath;
-+#endif
- osl_error = osl_File_E_None;
- }
- else
-@@ -515,12 +561,21 @@ oslFileError SAL_CALL osl_getDirectoryIt
-
- oslFileError osl_acquireDirectoryItem( oslDirectoryItem Item )
- {
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
-+#else
- rtl_uString* ustrFilePath = (rtl_uString *) Item;
-+#endif
-
- OSL_ASSERT( Item );
-
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ if( pImpl )
-+ oslDirectoryItemImpl_acquire( pImpl );
-+#else
- if( ustrFilePath )
- rtl_uString_acquire( ustrFilePath );
-+#endif
-
- return osl_File_E_None;
- }
-@@ -531,12 +586,21 @@ oslFileError osl_acquireDirectoryItem( o
-
- oslFileError osl_releaseDirectoryItem( oslDirectoryItem Item )
- {
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
-+#else
- rtl_uString* ustrFilePath = (rtl_uString *) Item;
-+#endif
-
- OSL_ASSERT( Item );
-
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ if( pImpl )
-+ oslDirectoryItemImpl_release( pImpl );
-+#else
- if( ustrFilePath )
- rtl_uString_release( ustrFilePath );
-+#endif
-
- return osl_File_E_None;
- }
---- sal/osl/unx/file_stat.cxx.old 2009-04-02 10:43:46.000000000 +0000
-+++ sal/osl/unx/file_stat.cxx 2009-04-06 16:41:38.000000000 +0000
-@@ -43,6 +43,7 @@
- #include <unistd.h>
- #endif
- #include <osl/file.h>
-+#include <dirent.h>
-
- #ifndef _ERRNO_H
- #include <errno.h>
-@@ -56,6 +57,9 @@
- #include "file_path_helper.hxx"
- #include "file_error_transl.h"
-
-+#ifdef _DIRENT_HAVE_D_TYPE
-+#include "file_impl.hxx"
-+#endif
-
- namespace /* private */
- {
-@@ -223,9 +227,19 @@ namespace /* private */
-
- /* we only need to call stat or lstat if one of the
- following flags is set */
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ inline bool is_stat_call_necessary(sal_uInt32 field_mask, oslDirectoryItemImpl *pImpl)
-+#else
- inline bool is_stat_call_necessary(sal_uInt32 field_mask)
-+#endif
- {
-- return ((field_mask & osl_FileStatus_Mask_Type) ||
-+ return (
-+/* on linux the dirent might have d_type */
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ ((field_mask & osl_FileStatus_Mask_Type) && (!pImpl->bHasType || pImpl->DType == DT_UNKNOWN)) ||
-+#else
-+ (field_mask & osl_FileStatus_Mask_Type) ||
-+#endif
- (field_mask & osl_FileStatus_Mask_Attributes) ||
- (field_mask & osl_FileStatus_Mask_CreationTime) ||
- (field_mask & osl_FileStatus_Mask_AccessTime) ||
-@@ -254,7 +268,11 @@ namespace /* private */
- if ((NULL == Item) || (NULL == pStat))
- return osl_File_E_INVAL;
-
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(((oslDirectoryItemImpl* ) Item)->ustrFilePath));
-+#else
- file_path = rtl::OUString(reinterpret_cast<rtl_uString*>(Item));
-+#endif
-
- OSL_ASSERT(file_path.getLength() > 0);
-
-@@ -285,10 +303,18 @@ oslFileError SAL_CALL osl_getFileStatus(
- #else
- struct stat file_stat;
- #endif
-- if (is_stat_call_necessary(uFieldMask) && (0 != osl::lstat(file_path, file_stat)))
-+
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ oslDirectoryItemImpl* pImpl = (oslDirectoryItemImpl*) Item;
-+ bool bStatNeeded = is_stat_call_necessary(uFieldMask, pImpl);
-+#else
-+ bool bStatNeeded = is_stat_call_necessary(uFieldMask);
-+#endif
-+
-+ if (bStatNeeded && (0 != osl::lstat(file_path, file_stat)))
- return oslTranslateFileError(OSL_FET_ERROR, errno);
-
-- if (is_stat_call_necessary(uFieldMask))
-+ if (bStatNeeded)
- {
- // we set all these attributes because it's cheap
- set_file_type(file_stat, pStat);
-@@ -305,6 +331,40 @@ oslFileError SAL_CALL osl_getFileStatus(
- return osl_error;
- }
- }
-+#ifdef _DIRENT_HAVE_D_TYPE
-+ else if (uFieldMask & osl_FileStatus_Mask_Type)
-+ {
-+ OSL_ASSERT(pImpl->bHasType);
-+
-+ switch(pImpl->DType)
-+ {
-+ case DT_LNK:
-+ pStat->eType = osl_File_Type_Link;
-+ break;
-+ case DT_DIR:
-+ pStat->eType = osl_File_Type_Directory;
-+ break;
-+ case DT_REG:
-+ pStat->eType = osl_File_Type_Regular;
-+ break;
-+ case DT_FIFO:
-+ pStat->eType = osl_File_Type_Fifo;
-+ break;
-+ case DT_SOCK:
-+ pStat->eType = osl_File_Type_Socket;
-+ break;
-+ case DT_CHR:
-+ case DT_BLK:
-+ pStat->eType = osl_File_Type_Special;
-+ break;
-+ default:
-+ OSL_ASSERT(0);
-+ pStat->eType = osl_File_Type_Unknown;
-+ }
-+
-+ pStat->uValidFields |= osl_FileStatus_Mask_Type;
-+ }
-+#endif
-
- if (uFieldMask & osl_FileStatus_Mask_FileURL)
- {
---- sal/osl/unx/file_impl.hxx.old 1970-01-01 00:00:00.000000000 +0000
-+++ sal/osl/unx/file_impl.hxx 2009-04-06 16:41:38.000000000 +0000
-@@ -0,0 +1,18 @@
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+typedef struct
-+{
-+ rtl_uString* ustrFilePath; /* holds native file name */
-+ unsigned char DType;
-+ bool bHasType;
-+ sal_uInt32 RefCount;
-+} oslDirectoryItemImpl;
-+
-+ oslDirectoryItemImpl* oslDirectoryItemImpl_CreateNew( rtl_uString* _ustrFilePath, bool _bHasDType, unsigned char _DType=0 );
-+ void oslDirectoryItemImpl_Destroy( oslDirectoryItemImpl* pItem );
-+ void oslDirectoryItemImpl_acquire( oslDirectoryItemImpl* pItem );
-+ void oslDirectoryItemImpl_release( oslDirectoryItemImpl* pItem );
-+#ifdef __cplusplus
-+} /* extern "C" */
-+#endif
commit b551d615800933ea5bdbeb7ae11b5a7b85773072
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:17:45 2009 +0300
Update for dev300-m54.
* patches/dev300/speed-pagein.diff: Update for dev300-m54.
diff --git a/patches/dev300/speed-pagein.diff b/patches/dev300/speed-pagein.diff
index bbf6f56..0da8378 100644
--- a/patches/dev300/speed-pagein.diff
+++ b/patches/dev300/speed-pagein.diff
@@ -5,33 +5,13 @@ retrieving revision 1.9
diff -u -p -u -r1.9 makefile.mk
--- desktop/source/pagein/makefile.mk 5 Oct 2006 10:47:06 -0000 1.9
+++ desktop/source/pagein/makefile.mk 31 Jan 2008 15:22:20 -0000
-@@ -73,8 +73,9 @@ ALL: \
- ALLTAR
-
- .INCLUDE : target.mk
-+.INCLUDE .IGNORE : icuversion.mk
-
--ICUDLLPOST=$(DLLPOST).26
-+ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR)
- UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR)
- UNODLLPOST=.uno$(DLLPOST)
- DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default
-@@ -99,7 +100,6 @@ $(MISC)$/$(TARGET)-writer : makefile.mk
- @-echo $(DLLPRE)sw$(DFTDLLPOST) > $@
- @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@
-
--# sorted in reverse load order (ld.so.1)
- $(MISC)$/$(TARGET)-common : makefile.mk
- @echo Making: $@
- @-echo $(DLLPRE)icui18n$(ICUDLLPOST) > $@
-@@ -138,5 +138,39 @@ $(MISC)$/$(TARGET)-common : makefile.mk
+@@ -138,6 +138,40 @@ $(MISC)$/$(TARGET)-common : makefile.mk
@-echo $(DLLPRE)svl$(DFTDLLPOST) >> $@
@-echo $(DLLPRE)vcl$(DFTDLLPOST) >> $@
@-echo $(DLLPRE)tk$(DFTDLLPOST) >> $@
- @-echo $(DLLPRE)svt$(DFTDLLPOST) >> $@
+ @-echo types.rdb >> $@
+ @-echo services.rdb >> $@
- @-echo soffice.bin >> $@
+# urgh ...
+ @-echo oovbaapi.rdb >> $@
+ @-echo deployment$$(DLLPOSTFIX)$(UNODLLPOST) >> $@
@@ -65,3 +45,5 @@ diff -u -p -u -r1.9 makefile.mk
+ @-echo bootstrap$(UNODLLPOST) >> $@
+ @-echo reflection$(UNODLLPOST) >> $@
+ @-echo stocservices$(UNODLLPOST) >> $@
+ @-echo $(DLLPRE)sfx$(DFTDLLPOST) >> $@
+ @-echo $(DLLPRE)sofficeapp$(DLLPOST) >> $@
commit 7880e31740bec863bfa82dacdb7e85d9f9633486
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:16:45 2009 +0300
* patches/dev300/fix-gtk-a11y.diff: dos2unix
diff --git a/patches/dev300/fix-gtk-a11y.diff b/patches/dev300/fix-gtk-a11y.diff
index 57397ef..b66701c 100644
--- a/patches/dev300/fix-gtk-a11y.diff
+++ b/patches/dev300/fix-gtk-a11y.diff
@@ -1,22 +1,22 @@
---- vcl/unx/source/plugadapt/salplug.cxx (revision 264856)
-+++ vcl/unx/source/plugadapt/salplug.cxx (working copy)
-@@ -92,18 +92,6 @@
- if( pInst )
- {
- pCloseModule = aMod;
--
-- /*
-- * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
-- * not access the 'gnome_accessibility_module_shutdown' anymore.
-- * So make sure libgtk+ & co are still mapped into memory when
-- * atk-bridge's atexit handler gets called.
-- */
-- if( rModuleBase.equalsAscii("gtk") )
-- {
-- pCloseModule = NULL;
-- }
--
- GetSalData()->m_pPlugin = aMod;
- }
- else
-
+--- vcl/unx/source/plugadapt/salplug.cxx (revision 264856)
++++ vcl/unx/source/plugadapt/salplug.cxx (working copy)
+@@ -92,18 +92,6 @@
+ if( pInst )
+ {
+ pCloseModule = aMod;
+-
+- /*
+- * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
+- * not access the 'gnome_accessibility_module_shutdown' anymore.
+- * So make sure libgtk+ & co are still mapped into memory when
+- * atk-bridge's atexit handler gets called.
+- */
+- if( rModuleBase.equalsAscii("gtk") )
+- {
+- pCloseModule = NULL;
+- }
+-
+ GetSalData()->m_pPlugin = aMod;
+ }
+ else
+
commit 59b81592d8df764b5ffc0d74e523ff6a44652672
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:13:48 2009 +0300
Make apply to dev300-m54.
* patches/dev300/fix-gtk-a11y.diff: Update for dev300-m54.
diff --git a/patches/dev300/fix-gtk-a11y.diff b/patches/dev300/fix-gtk-a11y.diff
index 9bb53bb..57397ef 100644
--- a/patches/dev300/fix-gtk-a11y.diff
+++ b/patches/dev300/fix-gtk-a11y.diff
@@ -1,61 +1,22 @@
---- vcl/unx/source/plugadapt/salplug.cxx (revision 264856)
-+++ vcl/unx/source/plugadapt/salplug.cxx (working copy)
-@@ -92,32 +92,6 @@
- if( pInst )
- {
- pCloseModule = aMod;
--
-- /*
-- * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
-- * not access the 'gnome_accessibility_module_shutdown' anymore.
-- * So make sure libgtk+ & co are still mapped into memory when
-- * atk-bridge's atexit handler gets called.
-- */
-- if( rModuleBase.equalsAscii("gtk") )
-- {
-- const char* gtk_modules = getenv( "GTK_MODULES" );
-- if( gtk_modules )
-- {
-- rtl::OString aModules( gtk_modules );
-- sal_Int32 nIndex = 0;
-- while( nIndex >= 0 )
-- {
-- rtl::OString aToken = aModules.getToken( 0, ':', nIndex );
-- if( aToken.equals( "atk-bridge" ) )
-- {
-- pCloseModule = NULL;
-- break;
-- }
-- }
-- }
-- }
--
- GetSalData()->m_pPlugin = aMod;
- }
- else
-
---- vcl/unx/gtk/app/gtkinst.cxx (revision 264856)
-+++ vcl/unx/gtk/app/gtkinst.cxx (working copy)
-@@ -174,21 +174,7 @@
- pSalData->Init();
- pSalData->initNWF();
-
-- const char* pGtkModules = getenv( "GTK_MODULES" );
-- if( pGtkModules )
-- {
-- rtl::OString aModules( pGtkModules );
-- sal_Int32 nIndex = 0;
-- while( nIndex >= 0 )
-- {
-- rtl::OString aToken = aModules.getToken( 0, ':', nIndex );
-- if( aToken.equals( "gail" ) || aToken.equals( "atk-bridge" ) )
-- {
-- InitAtkBridge();
-- break;
-- }
-- }
-- }
-+ InitAtkBridge();
-
- return pInstance;
- }
+--- vcl/unx/source/plugadapt/salplug.cxx (revision 264856)
++++ vcl/unx/source/plugadapt/salplug.cxx (working copy)
+@@ -92,18 +92,6 @@
+ if( pInst )
+ {
+ pCloseModule = aMod;
+-
+- /*
+- * Recent GTK+ versions load their modules with RTLD_LOCAL, so we can
+- * not access the 'gnome_accessibility_module_shutdown' anymore.
+- * So make sure libgtk+ & co are still mapped into memory when
+- * atk-bridge's atexit handler gets called.
+- */
+- if( rModuleBase.equalsAscii("gtk") )
+- {
+- pCloseModule = NULL;
+- }
+-
+ GetSalData()->m_pPlugin = aMod;
+ }
+ else
+
commit 385e8d81189902166c33cbd3a5bd6290d8543248
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:11:30 2009 +0300
speed-getfilestatus-dtype.diff is not needed.
* patches/dev300/apply: speed-getfilestatus-dtype.diff has been
upstreamed in dev300-m54.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 06a0c63..0f745d5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -184,9 +184,6 @@ makefile-idl-build.diff, noelpwer
# Pagein types.rdb / services.rdb & the ui files
speed-pagein.diff, i#57679, michael
-# Use d_type entry when possible to get file type instead of using stat
-speed-getfilestatus-dtype.diff, rodo, i#63159
-
# Replace hunspell linked list implementation with hashed implementation
# Reduces hunspell mem usage by more than half (3.7M to ~680K)
# (even bigger savings on 64bit, and with dicts like the Czech one)
commit 8b66dbc49b554ca344afa0807ee3f82313a6614c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:09:10 2009 +0300
Update for dev300-m54.
* bin/unpack: Use also the l10n tarball when needed. Remove an
obsolete and already commented-out snippet. Do the Hungarian fix
only on the l10n directory.
diff --git a/bin/unpack b/bin/unpack
index 7bd5e40..d51a799 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -80,6 +80,9 @@ if test "z$OOO_GIT" = "z" ; then
else
CORE_PKGS=$ALL_CORE_PKGS
fi
+ if test "z$OOO_LANGS" != "zen-US" -o "z$BUILD_WIN32" != "z"; then
+ CORE_PKGS="$CORE_PKGS l10n"
+ fi
for pkg in $CORE_PKGS; do
check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"
done
@@ -295,22 +298,19 @@ fi
echo "Fixing unfortunate snafus"
cd $BUILDDIR
-# Work around component-schema.dtd mess in m142 up to m151; seems to be fixed in m152
-# if test -e "$OOBUILDDIR/officecfg/registry/component-schema.dtd"; then
-# $GNUCP $OOBUILDDIR/officecfg/registry/component-schema.dtd $OOBUILDDIR/officecfg/registry/schema
-# fi
-
# workaround for i#56622, n#210797
if test "z$PIECE" = "z"; then
case "$OOO_LANGS" in
*\ hu\ *|*\ hu|hu\ *|hu)
echo "Fixing Hungarian strings: OOo vs. SO"
- for file in `find $OOBUILDDIR -type f -name "localize.sdf"` ; do
- chmod 644 $file
- $TOOLSDIR/bin/a2az.pl $file >$file.a2az
- mv $file.a2az $file
- done
+ if [ -d $OOBUILDDIR/l10n ]; then
+ for file in `find $OOBUILDDIR/l10n -type f -name "localize.sdf"` ; do
+ chmod 644 $file
+ $TOOLSDIR/bin/a2az.pl $file >$file.a2az
+ mv $file.a2az $file
+ done
+ fi
;;
esac
fi
commit 823722a8bb7d641a5a28157eda6d5d455cec2d98
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:07:23 2009 +0300
Download l10n tarball more eagerly.
* download.in: Download the l10n tarball in more cases.
diff --git a/download.in b/download.in
index 3b58f3c..77845c7 100755
--- a/download.in
+++ b/download.in
@@ -353,9 +353,7 @@ if ('@USE_PREBUILD_UNOWINREG_DLL@' eq 'YES') {
}
if ( $download_all || '@OOO_LANGS@' ne 'en-US' || '@BUILD_WIN32@' ne '' ) {
- if ( !$SPLIT || ( '@OOO_GIT@' ne "" ) ) {
- source_file( "l10n" );
- }
+ source_file( "l10n" );
}
if ('@PIECE@' eq 'bootstrap') {
commit ee5e87fd5b200b6f2098b3b536d2f19b745d0dfb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Aug 7 16:02:29 2009 +0300
Make src-pack2 work with upstream dev300-m54.
* bin/modules2.txt: Experimental initial patch just to make it handle
upstream dev300-m54. Refinements surely needed later.
- Remove the now nonexistent psprint from libs-gui.
- Add xsltml and migrationanalysis to extensions
- Add l10n module to l10n archive
diff --git a/bin/modules2.txt b/bin/modules2.txt
index afebf8a..c77cdbe 100644
--- a/bin/modules2.txt
+++ b/bin/modules2.txt
@@ -10,10 +10,11 @@ artwork=default_images,external_images,ooo_custom_images
filters=binfilter,filter,hwpfilter,unoxml,writerfilter,writerperfect,xmerge,oox
testing=qadevOOo,smoketestoo_native,testshl2,testtools,testautomation
bootstrap=guw,dmake,instsetoo_native,scp2,solenv,soltools,stlport,soldep,aclocal.m4,oowintool,configure.in,configure.cmd,Makefile.in,install-sh,set_soenv.in,config.guess,configure,acinclude.m4,config.sub,makefile.rc,bootstrap.1
-libs-gui=basebmp,basegfx,canvas,comphelper,cppcanvas,dtrans,goodies,i18npool,i18nutil,o3tl,padmin,psprint,psprint_config,regexp,rsc,sax,sot,svtools,toolkit,tools,transex3,ucbhelper,unotools,vcl,vos
+libs-gui=basebmp,basegfx,canvas,comphelper,cppcanvas,dtrans,goodies,i18npool,i18nutil,o3tl,padmin,psprint_config,regexp,rsc,sax,sot,svtools,toolkit,tools,transex3,ucbhelper,unotools,vcl,vos
libs-core=avmedia,basic,configmgr,connectivity,desktop,drawinglayer,embeddedobj,eventattacher,fileaccess,formula,fpicker,framework,idl,linguistic,officecfg,oovbaapi,sandbox,scripting,sfx2,shell,sj2,svx,sysui,ucb,uui,xmlhelp,xmloff,xmlscript,readlicense_oo
libs-extern=afms,agg,beanshell,epm,external,fondu,hsqldb,libegg,libtextcat,libxmlsec,msfontextract,np_sdk,rhino,sane,twain,lpsolve,icc,openssl,unixODBC,vigra,x11_extensions,hyphen,libwpd,lucene,redland,cppunit,apple_remote
components=accessibility,automation,basctl,bean,crashrep,embedserv,extensions,forms,javainstaller2,lingucomponent,MathMLDTD,package,setup_native,UnoControls,wizards,xmlsecurity
postprocess=postprocess,packimages
libs-extern-sys=berkeleydb,bitstream_vera_fonts,expat,icu,jpeg,libxml2,libxslt,moz,neon,python,zlib,saxon,stax,boost,curl,dictionaries,cairo,hunspell
-extensions=sdext,swext,tomcat,apache-commons,jfreereport,reportbuilder,xpdf
+extensions=sdext,swext,tomcat,apache-commons,jfreereport,reportbuilder,xpdf,xsltml,migrationanalysis
+l10n=l10n
More information about the ooo-build-commit
mailing list