[ooo-build-commit] 2 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Aug 27 00:55:39 PDT 2009
patches/dev300/apply | 3
patches/dev300/svx-dialogs-resize.diff | 105 ---------------------------------
patches/dev300/sw-remove-csv-lock.diff | 31 ---------
3 files changed, 139 deletions(-)
New commits:
commit 7cc269ec0e9310180d3ffc2fd2da20d0f2bdf9cf
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 27 10:53:48 2009 +0300
sw-remove-csv-lock.diff is upstream
* patches/dev300/apply: Drop it.
* patches/dev300/sw-remove-csv-lock.diff: Delete. Is upstream in
dev300-m56.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7bc8f54..d29eefc 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -569,8 +569,6 @@ unxsplash-bmp-alias.diff, i#60696, jholesov
[ WriterFixes ]
# Allows to copy/paste html text which is between 2 unknown tags.
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
# Some WW8 fields weren't imported at all
sw-ww8-field-fix.diff, i#61075, i#89667, cbosdo
diff --git a/patches/dev300/sw-remove-csv-lock.diff b/patches/dev300/sw-remove-csv-lock.diff
deleted file mode 100644
index 9c2c9b0..0000000
--- a/patches/dev300/sw-remove-csv-lock.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/source/ui/dbui/dbmgr.cxx b/source/ui/dbui/dbmgr.cxx
-index f0f6090..34f84d7 100644
---- sw/source/ui/dbui/dbmgr.cxx
-+++ sw/source/ui/dbui/dbmgr.cxx
-@@ -1753,6 +1753,7 @@ ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
- uno::Reference< XConnection> xConnection;
- sal_Bool bUseMergeData = sal_False;
- uno::Reference< XColumnsSupplier> xColsSupp;
-+ bool bDisposeConnection = false;
- if(pImpl->pMergeData &&
- pImpl->pMergeData->sDataSource.equals(rDBName) && pImpl->pMergeData->sCommand.equals(rTableName))
- {
-@@ -1777,6 +1778,7 @@ ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
- {
- rtl::OUString sDBName(rDBName);
- xConnection = RegisterConnection( sDBName );
-+ bDisposeConnection = true;
- }
- if(bUseMergeData)
- pImpl->pMergeData->xConnection = xConnection;
-@@ -1807,6 +1809,10 @@ ULONG SwNewDBMgr::GetColumnFmt( const String& rDBName,
- {
- ::comphelper::disposeComponent( xColsSupp );
- }
-+ if(bDisposeConnection)
-+ {
-+ ::comphelper::disposeComponent( xConnection );
-+ }
- }
- else
- nRet = pNFmtr->GetFormatIndex( NF_NUMBER_STANDARD, LANGUAGE_SYSTEM );
commit 57492f4c130f9d8d59659780df49059e5a3d8a11
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 27 10:50:33 2009 +0300
svx-dialogs-resize.diff is upstream
* patches/dev300/svx-dialogs-resize.diff: Delete. Is fixed upstream.
* patches/dev300/apply: Drop it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 825332e..7bc8f54 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -482,7 +482,6 @@ i93000.diff, i#93000, atimar
# see http://wiki.services.openoffice.org/wiki/Hu.openoffice.org/QA_Screenshots
padmin-dialog-resize.diff, i#98164, atimar
sw-dialogs-resize.diff, i#98164, atimar
-svx-dialogs-resize.diff, i#98164, atimar
[ RadioButtons ]
forms-radio-button-group-names.diff, n#310052, i#30823, jonp
diff --git a/patches/dev300/svx-dialogs-resize.diff b/patches/dev300/svx-dialogs-resize.diff
deleted file mode 100644
index c26a1c0..0000000
--- a/patches/dev300/svx-dialogs-resize.diff
+++ /dev/null
@@ -1,105 +0,0 @@
---- svx/source/cui/svuidlg.src
-+++ svx/source/cui/svuidlg.src
-@@ -156,37 +156,37 @@
- };
- CancelButton 1
- {
-- Pos = MAP_APPFONT ( 275 , 6 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
-+ Pos = MAP_APPFONT ( 270 , 6 ) ;
-+ Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Close" ;
- };
- HelpButton 1
- {
-- Pos = MAP_APPFONT ( 275 , 26 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
-+ Pos = MAP_APPFONT ( 270 , 26 ) ;
-+ Size = MAP_APPFONT ( 60 , 14 ) ;
- };
- PushButton PB_UPDATE_NOW
- {
-- Pos = MAP_APPFONT ( 275 , 43 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
-+ Pos = MAP_APPFONT ( 270 , 43 ) ;
-+ Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Update" ;
- };
- PushButton PB_OPEN_SOURCE
- {
-- Pos = MAP_APPFONT ( 275 , 60 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
-+ Pos = MAP_APPFONT ( 270 , 60 ) ;
-+ Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Open" ;
- };
- PushButton PB_CHANGE_SOURCE
- {
-- Pos = MAP_APPFONT ( 275 , 77 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
-+ Pos = MAP_APPFONT ( 270 , 77 ) ;
-+ Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Modify..." ;
- };
- PushButton PB_BREAK_LINK
- {
-- Pos = MAP_APPFONT ( 275 , 94 ) ;
-- Size = MAP_APPFONT ( 50 , 14 ) ;
-+ Pos = MAP_APPFONT ( 270 , 94 ) ;
-+ Size = MAP_APPFONT ( 60 , 14 ) ;
- Text [ en-US ] = "~Break Link" ;
- };
- FixedText FT_FILES2
---- svx/inc/optgenrl.hrc.orig 2009-01-16 20:33:08.000000000 +0100
-+++ svx/inc/optgenrl.hrc 2009-01-16 20:33:24.000000000 +0100
-@@ -74,7 +74,7 @@
- #define LINEH 12
- #define FLINEH 8
- #define LEFT 12
--#define MID 96
-+#define MID 100
- #define RIGHT 248
- #define TOP 10
- #define LINE(y) (14+y*15)
---- svx/source/cui/zoom.src
-+++ svx/source/cui/zoom.src
-@@ -55,7 +55,7 @@
- RadioButton BTN_WHOLE_PAGE
- {
- Pos = MAP_APPFONT ( 12 , 27 ) ;
-- Size = MAP_APPFONT ( 91 , 10 ) ;
-+ Size = MAP_APPFONT ( 104 , 10 ) ;
- Text [ en-US ] = "~Fit width and height" ;
- };
- RadioButton BTN_PAGE_WIDTH
---- svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src.orig 2009-01-16 22:12:48.000000000 +0100
-+++ svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src 2009-01-16 22:16:07.000000000 +0100
-@@ -39,7 +39,7 @@
-
- #define FULL_WIDTH (220)
- #define FULL_HEIGHT (120)
--#define EDITBUTTON_WIDTH (70)
-+#define EDITBUTTON_WIDTH (75)
-
- #define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT)
- #define COL_2 (COL_1+RSC_SP_FLGR_SPACE_X)
---- svx/source/cui/hangulhanjadlg.src
-+++ svx/source/cui/hangulhanjadlg.src
-@@ -81,7 +81,7 @@
- RadioButton RB_HANJA_HANGUL_BRACKETED
- {
- Pos = MAP_APPFONT( 109, 81 );
-- Size = MAP_APPFONT( 55, 8 );
-+ Size = MAP_APPFONT( 56, 8 );
-
- Text [ en-US ] = "Hanja (Han~gul)";
- };
-@@ -89,7 +89,7 @@
- RadioButton RB_HANGUL_HANJA_BRACKETED
- {
- Pos = MAP_APPFONT( 167, 81 );
-- Size = MAP_APPFONT( 55, 8 );
-+ Size = MAP_APPFONT( 56, 8 );
-
- Text [ en-US ] = "Hang~ul (Hanja)";
- };
More information about the ooo-build-commit
mailing list