[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/soenv2'
New branch 'feature/soenv2' available with the following commits: commit 6eb80737c333ed6cb706c391305ecb98fe838e6f Author: Norbert Thiebaud Date: Thu Jan 19 02:00:03 2012 -0600 migrate a bunch of mostly windows related variables + clean-up in set_soenv commit b1e46eddd16431e0123d44d178ce8be4e320eba9 Author: Norbert Thiebaud Date: Thu Jan 19 01:58:22 2012 -0600 ENABLE_RPATH and LINKFLAGSRUNPATH are not used commit 5c56f8f36fdc2785ed66ba45d3daae12402a1687 Author: Norbert Thiebaud Date: Thu Jan 19 01:55:59 2012 -0600 migrate TARFILE_LOCATION out of set_soenv commit e37d68a8f6c9c42cc5210118bd80bf20746b4515 Author: Norbert Thiebaud Date: Thu Jan 19 01:53:39 2012 -0600 avoid exporting un-necessary symbol/alias for stable scripts commit 46cf2d208ffbab0c38c6b07f3360c0dacc9886b9 Author: Norbert Thiebaud Date: Thu Jan 19 01:52:10 2012 -0600 migrate WITH_POOR_HELP_LOCALIZATIONS out of set_soenv commit f6ef15066aaa8fd87d71d480505de79e60c4a57c Author: Norbert Thiebaud Date: Thu Jan 19 01:48:41 2012 -0600 migrate ENABLE_DEBUG out of set_soenv commit 2aedab1a289f7dc604c4f540cabf5a5dac1babb0 Author: Norbert Thiebaud Date: Thu Jan 19 01:46:38 2012 -0600 WITH_VC_REDIST does not need exporting. it is a SCPDEFS only info commit ecb71ab22d9ca071578d899b012ec153b36511ac Author: Norbert Thiebaud Date: Thu Jan 19 01:44:29 2012 -0600 migrate SOLARINC/LIB[_FOR_BUILD] out of set_soenv commit 61dd97373ba3865797ab53f1fc1fd04d096730b1 Author: Norbert Thiebaud Date: Thu Jan 19 01:34:37 2012 -0600 migrate SYSBASE out of set_soenv commit 5b6ccfda960bd31760633dac1316fb1c9175879f Author: Norbert Thiebaud Date: Thu Jan 19 01:31:21 2012 -0600 migrate EXTERNAL_WARNINGS_NOT_ERRORS out of set_soenv commit 62e1774c2a5c66ce6f274da2d9015ae370b48233 Author: Norbert Thiebaud Date: Thu Jan 19 01:28:32 2012 -0600 replace SOLARSRC by SRC_ROOT and get rid of SOLARDEFIMG uses commit 15b1bc5e02cdd46b7d1a7eb4c8fbea9fd99ae1b3 Author: Norbert Thiebaud Date: Thu Jan 19 01:23:33 2012 -0600 remove unused CC_X64_BINARY commit fbe3af0b7dfc5828807e8b9c2fd3cba26a54df33 Author: Norbert Thiebaud Date: Wed Jan 18 15:54:03 2012 -0600 Eliminate un-used DIRECTX5 commit d327f2e3f3aff5c1b6214a523751e187ed4d877a Author: Norbert Thiebaud Date: Wed Jan 18 15:38:42 2012 -0600 migrate SYNAMIC_CRT and use_shl_version commit d1bc6eee75865673b8474f1687b7fb8ccf905bef Author: Norbert Thiebaud Date: Wed Jan 18 15:35:37 2012 -0600 move SunOS compiler detection up so that COMPATH is settled earlier commit 2ae30b3edda449a5bda89827d2bca4d8fc31a02f Author: Norbert Thiebaud Date: Wed Jan 18 15:34:39 2012 -0600 add api in configure.in to deal with PATH manipulations... prep-work for the migration of PATH handling from set_soenv... commit eef73f24e99f42e1804ec0c44c42f6239c723295 Author: Norbert Thiebaud Date: Wed Jan 18 15:33:30 2012 -0600 export a flag-variable to deal with cygwin only export commit a4c1a2b55fd39ece3179b1ad0a1e56e9bf28c974 Author: Norbert Thiebaud Date: Wed Jan 18 15:32:46 2012 -0600 add function to deal with native windows path variables commit 40db56839103147c24080f4f5c262ce4ac069eac Author: Norbert Thiebaud Date: Mon Jan 9 19:50:53 2012 -0600 move WORK_STAMP out of set_soenv.in commit 51b3918cdaa7fd4d8dcfa461d377408114e7b2a5 Author: Norbert Thiebaud Date: Mon Jan 9 19:09:14 2012 -0600 Move MACOS related variable out of set_soenv.in commit 8bba4adeb9d180a143f0fecc7f5af7c52cb7ec5f Author: Norbert Thiebaud Date: Tue Jan 3 13:02:04 2012 -0600 move COMPATH,EPM_FLAGS and connex variables out of set_soenv.in ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/inc sal/inc
cppuhelper/inc/cppuhelper/weak.hxx |6 +++---
sal/inc/osl/file.hxx | 13 +
sal/inc/osl/pipe_decl.hxx |4 ++--
sal/inc/osl/profile.hxx|9 -
sal/inc/osl/security_decl.hxx | 22 +-
sal/inc/osl/socket_decl.hxx|8
sal/inc/rtl/logfile.hxx|2 +-
sal/inc/rtl/string.hxx |2 +-
sal/inc/rtl/ustrbuf.hxx|6 +++---
9 files changed, 32 insertions(+), 40 deletions(-)
New commits:
commit 6ac30d8be976d60f56783327984b263fb1307e2a
Author: Norbert Thiebaud
Date: Thu Jan 19 20:18:48 2012 -0600
clean-up Doxygen warnings
diff --git a/cppuhelper/inc/cppuhelper/weak.hxx
b/cppuhelper/inc/cppuhelper/weak.hxx
index b8b9ddd..ceddbda 100644
--- a/cppuhelper/inc/cppuhelper/weak.hxx
+++ b/cppuhelper/inc/cppuhelper/weak.hxx
@@ -130,8 +130,8 @@ public:
SAL_THROW( () )
{ return *this; }
-/** Basic queryInterface() implementation supporting
::com::sun::star::uno::XWeak and
-::com::sun::star::uno::XInterface.
+/** Basic queryInterface() implementation supporting
\::com::sun::star::uno::XWeak and
+\::com::sun::star::uno::XInterface.
@param rType demanded type
@return demanded type or empty any
@@ -150,7 +150,7 @@ public:
/** XWeak::queryAdapter() implementation
-@return a ::com::sun::star::uno::XAdapter reference
+@return a \::com::sun::star::uno::XAdapter reference
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter
> SAL_CALL queryAdapter()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index 85393f5..d63126b 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -120,7 +120,7 @@ public:
@param ustrRequestedURL [in]
Requested name of a file or directory.
-@param pustrValidURL [out]
+@param ustrValidURL [out]
On success receives a name which is unused and valid on the actual
Operating System and
File System.
@@ -251,7 +251,7 @@ public:
/** Retrieves the file URL of the system's temporary directory path.
-@param ustrTempDirURL[out]
+@param[out] ustrTempDirURL
On success receives the URL of system's temporary directory path.
@return
@@ -1529,16 +1529,13 @@ public:
return (RC) osl_getFileStatus( _pData, &rStatus._aStatus,
rStatus._nMask );
}
-/** Determine if two directory items point the the same underlying file
+/** Determine if a directory item point the the same underlying file
The comparison is done first by URL, and then by resolving links to
find the target, and finally by comparing inodes on unix.
-@param pItemA [in]
-A directory handle to compare with another handle
-
-@param pItemB [in]
-A directory handle to compare with pItemA
+@param[in] pOther
+A directory handle to compare with the underlying object's item
@return
sal_True: if the items point to an identical resource
diff --git a/sal/inc/osl/pipe_decl.hxx b/sal/inc/osl/pipe_decl.hxx
index 54ccb93..b361440 100644
--- a/sal/inc/osl/pipe_decl.hxx
+++ b/sal/inc/osl/pipe_decl.hxx
@@ -59,7 +59,7 @@ public:
/** Creates a secure pipe that access depends on the umask settings.
@param strName
@param Options
-@param Security
+@param rSecurity
*/
inline Pipe(const ::rtl::OUString& strName, oslPipeOptions Options,const
Security & rSecurity);
@@ -87,7 +87,7 @@ public:
If the pipe was already created, the old one will be discarded.
@param strName
@param Options
-@param Security
+@param rSec
@return True if socket was successfully created.
*/
inline sal_Bool create( const ::rtl::OUString & strName,
diff --git a/sal/inc/osl/profile.hxx b/sal/inc/osl/profile.hxx
index 88476e0..e372285 100644
--- a/sal/inc/osl/profile.hxx
+++ b/sal/inc/osl/profile.hxx
@@ -62,7 +62,6 @@ namespace osl {
/** Close the opened profile an flush all data to the disk.
-@param Profile handle to a opened profile.
*/
~Profile()
{
@@ -143,8 +142,9 @@ namespace osl {
return bRet;
}
-/** Acquire the mutex, block if already acquired by another thread.
-@param Profile handle to a opened profile.
+/** Remove an entry from a section.
+@param rSection Name of the section.
+@param rEntry Name of the entry to remove.
@return False if section or entry could not be found.
*/
sal_Bool removeEntry(const rtl::OString& rSection, const rtl::OString&
rEntry)
@@ -153,7 +153,7 @@ namespace osl {
}
/** Get all entries belonging to the specified section.
-@param Profile handle to a opened profile.
+
[Libreoffice-commits] .: binfilter/bf_basic
binfilter/bf_basic/source/sbx/sbxvalue.cxx |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 65731b5747c2753a046e02be2a1fc81a4cfacda8
Author: Norbert Thiebaud
Date: Thu Jan 19 18:04:47 2012 -0600
fix SvStream:;operator>> problem
diff --git a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
index 44a7849..2da46d3 100644
--- a/binfilter/bf_basic/source/sbx/sbxvalue.cxx
+++ b/binfilter/bf_basic/source/sbx/sbxvalue.cxx
@@ -1550,7 +1550,11 @@ BOOL SbxValue::LoadData( SvStream& r, USHORT )
if( n > SAL_TYPES_SIZEOFINT )
r >> aData.nLong, aData.eType = SbxLONG;
else
-r >> aData.nInt;
+{
+sal_Int32 nInt;
+r >> nInt;
+aData.nInt = nInt;
+}
break;
}
case SbxUINT:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 ---
1 file changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 370fc96b92e59d35c2eb2e14fd77eb14bfc72fd4
Author: Miklos Vajna
Date: Fri Jan 20 01:36:25 2012 +0100
Fix RTF import of dotted and word underline
The problem was that these are flags, not toggles.
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b2e2f7d..0a1fafb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1450,6 +1450,21 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
checkUnicode();
RTFSkipDestination aSkip(*this);
int nParam = -1;
+int nSprm = -1;
+
+// Map all underline flags to a single sprm.
+switch (nKeyword)
+{
+case RTF_ULD: nSprm = 4; break;
+case RTF_ULW: nSprm = 2; break;
+default: break;
+}
+if (nSprm >= 0)
+{
+RTFValue::Pointer_t pValue(new RTFValue(nSprm));
+m_aStates.top().aCharacterSprms->push_back(make_pair(NS_sprm::LN_CKul,
pValue));
+return 0;
+}
// Indentation
switch (nKeyword)
@@ -2565,11 +2580,10 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword
nKeyword, bool bParam, int nParam
int nSprm = -1;
RTFValue::Pointer_t pBoolValue(new RTFValue(!bParam || nParam != 0));
-// Map all underline keywords to a single sprm.
+// Map all underline toggles to a single sprm.
switch (nKeyword)
{
case RTF_UL: nSprm = 1; break;
-case RTF_ULD: nSprm = 4; break;
case RTF_ULDASH: nSprm = 7; break;
case RTF_ULDASHD: nSprm = 9; break;
case RTF_ULDASHDD: nSprm = 10; break;
@@ -2583,7 +2597,6 @@ int RTFDocumentImpl::dispatchToggle(RTFKeyword nKeyword,
bool bParam, int nParam
case RTF_ULTHDASHDD: nSprm = 26; break;
case RTF_ULTHLDASH: nSprm = 55; break;
case RTF_ULULDBWAVE: nSprm = 43; break;
-case RTF_ULW: nSprm = 2; break;
case RTF_ULWAVE: nSprm = 11; break;
default: break;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - i18npool/source
i18npool/source/localedata/data/fr_BE.xml |1 + i18npool/source/localedata/data/fr_FR.xml |1 + i18npool/source/localedata/data/fr_LU.xml |1 + 3 files changed, 3 insertions(+) New commits: commit 688551303ee5b918841b64ac85f06ab12989b7fc Author: Eike Rathke Date: Thu Jan 19 23:47:48 2012 +0100 added [fr-LU] date acceptance pattern "D/M" diff --git a/i18npool/source/localedata/data/fr_LU.xml b/i18npool/source/localedata/data/fr_LU.xml index 4697c51..a0f7787 100644 --- a/i18npool/source/localedata/data/fr_LU.xml +++ b/i18npool/source/localedata/data/fr_LU.xml @@ -35,6 +35,7 @@ metric +D/M Standard commit 513e5c109da38f545b535120cf35126cb5b239fa Author: Eike Rathke Date: Thu Jan 19 23:46:41 2012 +0100 added [fr-BE] date acceptance pattern "D/M" diff --git a/i18npool/source/localedata/data/fr_BE.xml b/i18npool/source/localedata/data/fr_BE.xml index 2cb8be2..9e59a81 100644 --- a/i18npool/source/localedata/data/fr_BE.xml +++ b/i18npool/source/localedata/data/fr_BE.xml @@ -38,6 +38,7 @@ metric +D/M Standard commit 3e49fe29e8cf83bda35ca1858c8765073d348a11 Author: Eike Rathke Date: Thu Jan 19 23:44:46 2012 +0100 added [fr-FR] date acceptance pattern "D/M" diff --git a/i18npool/source/localedata/data/fr_FR.xml b/i18npool/source/localedata/data/fr_FR.xml index 2745d9b..1e2bbea 100644 --- a/i18npool/source/localedata/data/fr_FR.xml +++ b/i18npool/source/localedata/data/fr_FR.xml @@ -35,6 +35,7 @@ metric +D/M Standard ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com
offapi/com/sun/star/i18n/NumberFormatIndex.idl |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit decd4c806264042e5fd8b21026c7d3c0cc760f44
Author: Stephan Bergmann
Date: Thu Jan 19 23:34:54 2012 +0100
Undo comment fix that introduces start of nested comment.
diff --git a/offapi/com/sun/star/i18n/NumberFormatIndex.idl
b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
index 708b2d4..0dd4d21 100644
--- a/offapi/com/sun/star/i18n/NumberFormatIndex.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module i18n {
MUST support some predefined format codes. These predefined
format codes are accessed through indices as the following, and
the locale data format code definitions in
-i18npool/source/localedata/data/*.xml MUST have matching
+i18npool\source\localedata\data\*.xml MUST have matching
entries in the form
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - i18npool/source offapi/com
i18npool/source/localedata/data/kab_DZ.xml |1 +
offapi/com/sun/star/i18n/NumberFormatIndex.idl |6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit bffecae79a79feec906f55f25d0d563915d64c6e
Author: Eike Rathke
Date: Thu Jan 19 23:27:34 2012 +0100
added [kab-DZ] date acceptance pattern "D/M"
diff --git a/i18npool/source/localedata/data/kab_DZ.xml
b/i18npool/source/localedata/data/kab_DZ.xml
index ad39e6d..3e80f5d 100644
--- a/i18npool/source/localedata/data/kab_DZ.xml
+++ b/i18npool/source/localedata/data/kab_DZ.xml
@@ -35,6 +35,7 @@
metric
+D/M
General
commit 6f607469e97d6d6aeba99b5fcad264c40b47fd2e
Author: Eike Rathke
Date: Thu Jan 19 23:22:02 2012 +0100
minor corrections in comments
diff --git a/offapi/com/sun/star/i18n/NumberFormatIndex.idl
b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
index c7105b0..708b2d4 100644
--- a/offapi/com/sun/star/i18n/NumberFormatIndex.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatIndex.idl
@@ -50,7 +50,7 @@ module com { module sun { module star { module i18n {
MUST support some predefined format codes. These predefined
format codes are accessed through indices as the following, and
the locale data format code definitions in
-i18npool\source\localedata\data\*.xml MUST have matching
+i18npool/source/localedata/data/*.xml MUST have matching
entries in the form
@@ -65,7 +65,7 @@ module com { module sun { module star { module i18n {
Date formats may have a comment of DIN/EN/ISO, meaning
- DIN 5008 (Deutsche Industrie Norm)
+ DIN 5008 (Deutsches Institut für Normung, formerly
Deutsche Industrie-Norm)
EN 28601 (European Norm)
ISO 8601 (International Standards Organization)
@@ -198,7 +198,7 @@ published constants NumberFormatIndex
const short DATE_SYS_D = DATE_START+12;
/// 10-08DIN/EN
const short DATE_DIN_MMDD = DATE_START+13;
-/// 97-10-08 DIN/EN/ISO
+/// 97-10-08 DIN/EN
const short DATE_DIN_YYMMDD = DATE_START+14;
/// 1997-10-08 DIN/EN/ISO
const short DATE_DIN_MMDD = DATE_START+15;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/modules/installer/windows/msiglobal.pm | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
New commits:
commit 5d2f27834abd9ea13556387ffa7f773587edbebc
Author: Andras Timar
Date: Thu Jan 19 23:22:38 2012 +0100
fdo#44915 MSI installer l10n bug
Unfortunately msiinfo.exe has a limitation, it truncates Language
property in Summary Information at char position 254.
The replacement, WiLangId.vbs does not have this limitation.
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 8b8007a..a097780 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -982,14 +982,11 @@ sub create_transforms
my $msitran = "msitran.exe";# Has to be in the path
my $msidb = "msidb.exe";# Has to be in the path
-my $msiinfo = "msiinfo.exe";# Has to be in the path
+my $wilangid = $ENV{WINDOWS_SDK_HOME} .
"/Samples/SysMgmt/Msi/scripts/WiLangId.vbs";
my $from = cwd();
-my $architecture = "Intel";
-if (( $allvariableshashref->{'64BITPRODUCT'} ) && (
$allvariableshashref->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
-
-my $templatevalue = "\"" . $architecture . ";1033";
+my $templatevalue = "1033";
$installdir = installer::converter::make_path_conform($installdir);
@@ -1124,8 +1121,7 @@ sub create_transforms
}
}
-$templatevalue = $templatevalue . "\""; # adding
ending '"'
-$systemcall = $msiinfo . " " . $basedbname . " -p " . $templatevalue;
+$systemcall = "cscript.exe " . $wilangid . " " . $basedbname . " Package "
. $templatevalue;
$returnvalue = system($systemcall);
@@ -1134,12 +1130,12 @@ sub create_transforms
if ($returnvalue)
{
-$infoline = "ERROR: Could not execute $msiinfo!\n";
+$infoline = "ERROR: Could not execute WiLangId.vbs!\n";
push( @installer::globals::logfileinfo, $infoline);
}
else
{
-$infoline = "Success: Executed $msiinfo successfully!\n";
+$infoline = "Success: Executed WiLangId.vbs successfully!\n";
push( @installer::globals::logfileinfo, $infoline);
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/viewfun2.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 1df43525da87c181e7c9b42967f30072951cb794
Author: Kohei Yoshida
Date: Thu Jan 19 17:21:31 2012 -0500
Fix a crash when copying a sheet with drawing obj to a new document.
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 77a2601..3cb218d 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2466,7 +2467,7 @@ void ScViewFunc::MoveTable(
sal_Bool bUndo (pDoc->IsUndoEnabled());
bool bRename = pNewTabName && !pNewTabName->isEmpty();
-sal_Bool bNewDoc = ( nDestDocNo == SC_DOC_NEW );
+bool bNewDoc = (nDestDocNo == SC_DOC_NEW);
if ( bNewDoc )
{
nDestTab = 0; // firstly insert
@@ -2646,7 +2647,16 @@ void ScViewFunc::MoveTable(
pDestDoc->DeleteTab(static_cast(TheTabs.size())); // old
first table
if (pDestViewSh)
+{
+// Make sure to clear the cached page view after sheet
+// deletion, which still points to the sdr page belonging to
+// the deleted sheet.
+SdrView* pSdrView = pDestViewSh->GetSdrView();
+if (pSdrView)
+pSdrView->ClearPageView();
+
pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer
+}
pDestShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
PAINT_GRID | PAINT_TOP | PAINT_LEFT |
PAINT_EXTRAS | PAINT_SIZE );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/view/viewfun2.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 4dd59855872736864c24947ca9886af9472e0980
Author: Kohei Yoshida
Date: Thu Jan 19 17:21:31 2012 -0500
Fix a crash when copying a sheet with drawing obj to a new document.
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index e2c950c..794db51 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2466,7 +2467,7 @@ void ScViewFunc::MoveTable(
sal_Bool bUndo (pDoc->IsUndoEnabled());
bool bRename = pNewTabName && !pNewTabName->isEmpty();
-sal_Bool bNewDoc = ( nDestDocNo == SC_DOC_NEW );
+bool bNewDoc = (nDestDocNo == SC_DOC_NEW);
if ( bNewDoc )
{
nDestTab = 0; // firstly insert
@@ -2646,7 +2647,16 @@ void ScViewFunc::MoveTable(
pDestDoc->DeleteTab(static_cast(TheTabs.size())); // old
first table
if (pDestViewSh)
+{
+// Make sure to clear the cached page view after sheet
+// deletion, which still points to the sdr page belonging to
+// the deleted sheet.
+SdrView* pSdrView = pDestViewSh->GetSdrView();
+if (pSdrView)
+pSdrView->ClearPageView();
+
pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer
+}
pDestShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB,
PAINT_GRID | PAINT_TOP | PAINT_LEFT |
PAINT_EXTRAS | PAINT_SIZE );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - svx/inc svx/source
svx/inc/svx/svdpagv.hxx | 11 ---
svx/inc/svx/svdpntv.hxx |2 +-
svx/source/svdraw/svdmrkv.cxx | 17 +++--
svx/source/svdraw/svdpagv.cxx |7 ---
svx/source/svdraw/svdpntv.cxx |2 +-
5 files changed, 9 insertions(+), 30 deletions(-)
New commits:
commit 50f4d165b42a85993685e546cbc524bc1bf68e5c
Author: Kohei Yoshida
Date: Thu Jan 19 16:51:09 2012 -0500
Make this a private member (to make it easier to keep track of its usage).
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 761e5d3..c5773d1 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -132,6 +132,7 @@ class SVX_DLLPUBLIC SdrPaintView : public SfxListener,
public SfxRepeatTarget, p
friend classFrameAnimator;
friend classSdrGrafObj;
+SdrPageView*mpPageView;
protected:
SdrModel* pMod;
#ifdef DBG_UTIL
@@ -145,7 +146,6 @@ protected:
String aMeasureLayer; // Aktueller Layer fuer
Bemassung
// Container aPagV; // Liste von SdrPageViews
-SdrPageView*mpPageView;
// All windows this view is displayed on
SdrPaintWindowVectormaPaintWindows;
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index f720e68..d7c8959 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -307,21 +307,15 @@ void SdrMarkView::ClearPageView()
void SdrMarkView::HideSdrPage()
{
bool bMrkChg(false);
-//HMHbool bVis(false);
-if(mpPageView)
+SdrPageView* pPageView = GetSdrPageView();
+if (pPageView)
{
// break all creation actions when hiding page (#75081#)
BrkAction();
-//HMHbVis = IsMarkHdlShown();
-
-//HMHif(bVis)
-//HMH{
-//HMH HideMarkHdl();
-//HMH}
// Discard all selections on this page
-bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*mpPageView);
+bMrkChg = GetMarkedObjectListWriteAccess().DeletePageView(*pPageView);
}
SdrSnapView::HideSdrPage();
@@ -331,11 +325,6 @@ void SdrMarkView::HideSdrPage()
MarkListHasChanged();
AdjustMarkHdl();
}
-
-//HMHif(bVis)
-//HMH{
-//HMH ShowMarkHdl();
-//HMH}
}
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 331354b..8d5d71a 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -204,7 +204,7 @@ void SdrPaintView::ImpClearVars()
}
SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
-: mpPageView(0L),
+: mpPageView(NULL),
aDefaultAttr(pModel1->GetItemPool()),
mbBufferedOutputAllowed(false),
mbBufferedOverlayAllowed(false),
commit d06779dd50a61b941dbfe9bb2a2f4070aaa09ce5
Author: Kohei Yoshida
Date: Thu Jan 19 16:31:19 2012 -0500
No class derives from SdrPageView. No sense using protected visibility.
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 4b06de3..ab75435 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -73,7 +73,7 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector;
class SVX_DLLPUBLIC SdrPageView
{
-protected:
+private:
SdrView& mrView;
SdrPage* mpPage;
Point aPgOrg; // Nullpunkt der Page
@@ -105,7 +105,7 @@ protected:
SdrPageWindow* mpPreparedPageWindow;
// interface to SdrPageWindow
-protected:
+private:
void ClearPageWindows();
void AppendPageWindow(SdrPageWindow& rNew);
SdrPageWindow* RemovePageWindow(SdrPageWindow& rOld);
@@ -124,13 +124,12 @@ public:
const SdrPageWindow* FindPatchedPageWindow( const OutputDevice& rOutDev )
const;
void PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) const;
+
private:
SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow&
rPaintWindow);
-protected:
void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
-protected:
void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
sal_Bool IsLayer(const String& rName, const SetOfByte& rBS) const;
commit 71860292f774920c99663cdbd8bbe0498a0e8da5
Author: Kohei Yoshida
Date: Thu Jan 19 16:25:42 2012 -0500
Don't be a listener if you aren't interested in listening.
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index 8a825a0..4b06de3 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -71,7 +71,7 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector;
-class SVX_DLLPUBLIC SdrPageView : public SfxListener
+class SVX_DLLPUBLIC SdrPageView
{
protected:
SdrView& mrView;
@@ -134,8 +134,6 @@ protected:
void Set
[Libreoffice-commits] .: i18npool/source
i18npool/source/localedata/data/be_BY.xml |2 ++ 1 file changed, 2 insertions(+) New commits: commit 09c1d111208619197fa851b21ff24bd261a93b15 Author: Eike Rathke Date: Thu Jan 19 22:37:53 2012 +0100 added [be-BY] date acceptance patterns "D.M." and "D/M/" diff --git a/i18npool/source/localedata/data/be_BY.xml b/i18npool/source/localedata/data/be_BY.xml index a020dcc..6d1bc97 100644 --- a/i18npool/source/localedata/data/be_BY.xml +++ b/i18npool/source/localedata/data/be_BY.xml @@ -35,6 +35,8 @@ Metric +D/M/ +D.M. Standard ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - i18npool/source
i18npool/source/localedata/LocaleNode.cxx | 22 --
i18npool/source/localedata/data/ja_JP.xml |7 +++
2 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit af25972c19bcd0bef7739bd777c67907d61b2b16
Author: Eike Rathke
Date: Thu Jan 19 22:25:33 2012 +0100
added [ja-JP] date acceptance patterns (various)
diff --git a/i18npool/source/localedata/data/ja_JP.xml
b/i18npool/source/localedata/data/ja_JP.xml
index 54c42a2..0b39a2c 100644
--- a/i18npool/source/localedata/data/ja_JP.xml
+++ b/i18npool/source/localedata/data/ja_JP.xml
@@ -35,6 +35,13 @@
metric
+M-D
+M/D
+Mï¼D
+Y.M.D
+Yï¼Mï¼D
+Yå¹´MæDæ¥
+MæDæ¥
Standard
commit 0dc4e9cd0aac2d203219bb5ea4266693427c744c
Author: Eike Rathke
Date: Thu Jan 19 22:23:59 2012 +0100
added check for duplicated date acceptance patterns
Also insert full date acceptance pattern at first position instead of
appending to have it be first in checks.
diff --git a/i18npool/source/localedata/LocaleNode.cxx
b/i18npool/source/localedata/LocaleNode.cxx
index 1b1e777..42cf583 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1185,7 +1185,8 @@ void LCFormatNode::generateCode (const OFileWriter &of)
const
{
fprintf( stderr, "Generated date acceptance pattern: '%s' from
'%s'\n",
OSTR( aPattern), OSTR( sTheDateEditFormat));
-theDateAcceptancePatterns.push_back( aPattern);
+// Insert at front so full date pattern is first in checks.
+theDateAcceptancePatterns.insert(
theDateAcceptancePatterns.begin(), aPattern);
}
if (aPatternBuf2.getLength() > 0)
{
@@ -1200,7 +1201,7 @@ void LCFormatNode::generateCode (const OFileWriter &of)
const
{
fprintf( stderr, "Generated 2nd acceptance pattern: '%s' from
'%s'\n",
OSTR( aPattern2), OSTR( sTheDateEditFormat));
-theDateAcceptancePatterns.push_back( aPattern2);
+theDateAcceptancePatterns.insert(
theDateAcceptancePatterns.begin(), aPattern2);
}
}
@@ -1222,6 +1223,23 @@ void LCFormatNode::generateCode (const OFileWriter &of)
const
}
}
+// Check for duplicates.
+for (vector::const_iterator aIt =
theDateAcceptancePatterns.begin();
+aIt != theDateAcceptancePatterns.end(); ++aIt)
+{
+for (vector::iterator aComp =
theDateAcceptancePatterns.begin();
+aComp != theDateAcceptancePatterns.end(); /*nop*/)
+{
+if (aIt != aComp && *aIt == *aComp)
+{
+incErrorStr( "Duplicated DateAcceptancePattern", *aComp);
+aComp = theDateAcceptancePatterns.erase( aComp);
+}
+else
+++aComp;
+}
+}
+
sal_Int16 nbOfDateAcceptancePatterns =
static_cast(theDateAcceptancePatterns.size());
for (sal_Int16 i = 0; i < nbOfDateAcceptancePatterns; ++i)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sd/CppunitTest_sd_regression_test.mk sd/Module_sd.mk sd/qa unotest/inc unotest/source
sd/CppunitTest_sd_regression_test.mk |3
sd/Module_sd.mk |1
sd/qa/unit/data/svg/test.svg | 162 +++
sd/qa/unit/regression-test.cxx | 40 ++
unotest/inc/unotest/bootstrapfixturebase.hxx |6 +
unotest/source/cpp/bootstrapfixturebase.cxx | 10 +
6 files changed, 220 insertions(+), 2 deletions(-)
New commits:
commit 28e1b3984080e238866fcd44034de6ea47895962
Author: Markus Mohrhard
Date: Thu Jan 19 21:04:26 2012 +0100
enable sd's regression test in the subsequenttest target
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 4fd3a95..edc6f25 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -52,6 +52,7 @@ endif
$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
JunitTest_sd_unoapi \
+CppunitTest_sd_regression_test \
))
# vim: set noet sw=4 ts=4:
commit 9b27d39081379aefbd8e1636088bf7eee3216ae3
Author: Markus Mohrhard
Date: Thu Jan 19 21:01:05 2012 +0100
finish sd's regression test
Implemented a simple character based comparison of the exported file and
the reference file
diff --git a/sd/CppunitTest_sd_regression_test.mk
b/sd/CppunitTest_sd_regression_test.mk
index 42a7d99..1c3b089 100644
--- a/sd/CppunitTest_sd_regression_test.mk
+++ b/sd/CppunitTest_sd_regression_test.mk
@@ -30,7 +30,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,sd_regression_test))
$(eval $(call gb_CppunitTest_add_exception_objects,sd_regression_test, \
-sd/qa/unit/regression-test2 \
+sd/qa/unit/regression-test \
))
$(eval $(call gb_CppunitTest_add_linked_libs,sd_regression_test, \
@@ -113,7 +113,6 @@ $(eval $(call
gb_CppunitTest_add_components,sd_regression_test,\
ucb/source/core/ucb1 \
ucb/source/ucp/expand/ucpexpand1 \
ucb/source/ucp/file/ucpfile1 \
-ucb/source/ucp/gio/ucpgio \
ucb/source/ucp/package/ucppkg1 \
ucb/source/ucp/tdoc/ucptdoc1 \
unotools/util/utl \
diff --git a/sd/qa/unit/data/svg/test.svg b/sd/qa/unit/data/svg/test.svg
new file mode 100644
index 000..9e8ce1d
--- /dev/null
+++ b/sd/qa/unit/data/svg/test.svg
@@ -0,0 +1,162 @@
+
+
+http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xml:space="preserve">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ C
+ l
+ i
+ c
+ k
+
+ t
+ o
+
+ e
+ d
+ i
+ t
+
+ t
+ h
+ e
+
+ t
+ i
+ t
+ l
+ e
+
+ t
+ e
+ x
+ t
+
+ f
+ o
+ r
+ m
+ a
+ t
+
+
+
+
+
+
+
+
+
+
+ H
+ e
+ l
+ l
+ o
+
+
+
+
+
+
+
+
+ R
+ a
+ d
+ e
+ k
+ s
+ k
+ i
+
+ :
+ -
+ )
+
+
+
+
+
+
+
+
+
+
+
+ .
+ .
+ .
+
+
+
+
+
+
diff --git a/sd/qa/unit/regression-test.cxx b/sd/qa/unit/regression-test.cxx
index c8caff0..4ed5b80 100644
--- a/sd/qa/unit/regression-test.cxx
+++ b/sd/qa/unit/regression-test.cxx
@@ -52,6 +52,44 @@
#include
#include
+#include
+#include
+#include
+
+namespace {
+
+bool compareFiles( const rtl::OUString& aFileNameOne, const rtl::OUString&
aFileNameTwo)
+{
+rtl::OString aOFileNameOne = rtl::OUStringToOString(aFileNameOne,
RTL_TEXTENCODING_UTF8);
+std::ifstream aFileOne(aOFileNameOne.getStr());
+rtl::OString aOFileNameTwo = rtl::OUStringToOString(aFileNameTwo,
RTL_TEXTENCODING_UTF8);
+std::ifstream aFileTwo(aOFileNameTwo.getStr());
+
+CPPUNIT_ASSERT_MESSAGE("files not open", aFileOne.is_open() &&
aFileTwo.is_open());
+
+sal_Int32 nLine = 1;
+while(!aFileOne.eof() && !aFileTwo.eof())
+{
+std::string aLineFileOne;
+std::string aLineFileTwo;
+
+std::getline(aFileOne, aLineFileOne);
+std::getline(aFileTwo, aLineFileTwo);
+
+if( aLineFileOne != aLineFileTwo)
+{
+rtl::OStringBuffer aErrorMessage("Mismatch between reference file
and exported file in line ");
+aErrorMessage.append(nLine).append(".\nExpected: ");
+aErrorMessage.append(aLineFileOne.c_str()).append("\nFound :
").append(aLineFileTwo.c_str());
+CPPUNIT_ASSERT_MESSAGE(aErrorMessage.getStr(),
[Libreoffice-commits] .: 3 commits - dbaccess/source svx/source
dbaccess/source/core/api/RowSetBase.cxx |2
dbaccess/source/core/api/RowSetCache.cxx | 313 ---
dbaccess/source/core/api/RowSetCache.hxx | 10
svx/source/fmcomp/gridctrl.cxx |4
4 files changed, 178 insertions(+), 151 deletions(-)
New commits:
commit 1234d599d4ee67bd725f0513431b2d4c56c9e09d
Author: Lionel Elie Mamane
Date: Thu Jan 19 20:20:06 2012 +0100
ORowSetCache: overhaul internals
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index 8fc264a..bcc8652 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -443,17 +443,29 @@ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
}
if(!m_nPosition)
{
-sal_Int32 nNewSt = 1;
-fillMatrix(nNewSt,_nSize+1);
+sal_Int32 nNewSt = 0;
+fillMatrix(nNewSt,_nSize);
+OSL_ENSURE(nNewSt == 0, "fillMatrix set new start to unexpected
value");
m_nStartPos = 0;
m_nEndPos = _nSize;
}
-else if (m_nStartPos < m_nPosition && m_nPosition < m_nEndPos)
+else if (m_nStartPos < m_nPosition && m_nPosition <= m_nEndPos)
{
sal_Int32 nNewSt = -1;
-fillMatrix(nNewSt,_nSize+1);
-m_nStartPos = 0;
-m_nEndPos = _nSize;
+fillMatrix(nNewSt,_nSize);
+if (nNewSt >= 0)
+{
+m_nStartPos = nNewSt;
+m_nEndPos = nNewSt + _nSize;
+m_aMatrixIter = calcPosition();
+}
+}
+else
+{
+OSL_FAIL("m_nPosition not between m_nStartPos and m_nEndpos");
+// try to repair
+moveWindow();
+m_aMatrixIter = calcPosition();
}
}
@@ -737,32 +749,34 @@ sal_Bool ORowSetCache::afterLast( )
sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32
_nNewEndPos)
{
OSL_ENSURE(_nNewStartPos != _nNewEndPos,"ORowSetCache::fillMatrix:
StartPos and EndPos can not be equal!");
-// fill the whole window with new data
+// If _nNewStartPos >= 0, then fill the whole window with new data
+// Else if _nNewStartPos == -1, then fill only segment [m_nEndPos,
_nNewEndPos)
+// Else, undefined (invalid argument)
+OSL_ENSURE( _nNewStartPos >= -1, "ORowSetCache::fillMatrix: invalid
_nNewStartPos" );
+
ORowSetMatrix::iterator aIter;
sal_Int32 i;
sal_Bool bCheck;
if ( _nNewStartPos == -1 )
{
-aIter = m_pMatrix->begin() + m_nEndPos;
-i = m_nEndPos+1;
+aIter = m_pMatrix->begin() + (m_nEndPos - m_nStartPos);
+i = m_nEndPos;
}
else
{
aIter = m_pMatrix->begin();
-i = _nNewStartPos;
+i = _nNewStartPos + 1;
}
-bCheck = m_pCacheSet->absolute(i); // -1 no need to
+bCheck = m_pCacheSet->absolute(i);
-for(;i<_nNewEndPos;++i,++aIter)
+for(; i <= _nNewEndPos; ++i,++aIter)
{
if(bCheck)
{
if(!aIter->is())
*aIter = new ORowSetValueVector(m_xMetaData->getColumnCount());
m_pCacheSet->fillValueRow(*aIter,i);
-if(!m_bRowCountFinal)
-++m_nRowCount;
}
else
{ // there are no more rows found so we can fetch some before start
@@ -775,35 +789,28 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32&
_nNewStartPos,sal_Int32 _nNewEndPos
m_nRowCount = i-1; // it can be that getRow return zero
m_bRowCountFinal = sal_True;
}
-if(m_nRowCount > m_nFetchSize)
+const ORowSetMatrix::iterator aEnd = aIter;
+ORowSetMatrix::iterator aRealEnd = m_pMatrix->end();
+sal_Int32 nPos = (m_nRowCount > m_nFetchSize) ? (m_nRowCount -
m_nFetchSize) : 0;
+_nNewStartPos = nPos;
+++nPos;
+bCheck = m_pCacheSet->absolute(nPos);
+
+for(;bCheck && aIter != aRealEnd;++aIter)
{
-ORowSetMatrix::iterator aEnd = aIter;
-ORowSetMatrix::iterator aRealEnd = m_pMatrix->end();
-sal_Int32 nPos = m_nRowCount - m_nFetchSize + 1;
-_nNewStartPos = nPos;
-bCheck = m_pCacheSet->absolute(_nNewStartPos);
-
-for(;bCheck && aIter != aRealEnd;++aIter)
-{
-if(bCheck)
-{
-if(!aIter->is())
-*aIter = new
ORowSetValueVector(m_xMetaData->getColumnCount());
-m_pCacheSet->fillValueRow(*aIter,nPos++);
-}
-bCheck = m_pCacheSet->next();
-}
-if(aIter != aEnd)
-::std::rotate(m_pMatrix->begin(),aEnd,aRealEnd);
+if(!aIter->is())
+*aIter = new
ORowSetValueVector(m_xMetaData->getColumnCount());
+m_pCacheSet->fillValueRow(*aIter,nPos++);
+
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/WNT_INTEL_MSC.mk |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit f727553f3b8c6632d1d374b918221649a9427eac
Author: Tor Lillqvist
Date: Thu Jan 19 22:03:34 2012 +0200
Don't break file: URLs
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index b7b4e94..7552f09 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -246,13 +246,19 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
# break the dummy implementations on unx*
+
+# This file:/// -> file:!!! -> file:/// substitution is to protect the
+# slashes after file: in a file: URL from being unduplicated by the
+# // -> / substitution.
define gb_Helper_convert_native
+$(subst file:!!!,file:///, \
$(subst //,/, \
+$(subst file:///,file:!!!, \
$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1))
+$(1
endef
# YaccTarget class
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source cppu/inc stoc/test
connectivity/source/drivers/dbase/DTable.cxx |2 -
cppu/inc/com/sun/star/uno/Reference.h| 33 ++-
stoc/test/testiadapter.cxx |2 -
3 files changed, 15 insertions(+), 22 deletions(-)
New commits:
commit 2fbefa3d30e05948e3263b9c4bfe40ac49204f55
Author: Stephan Bergmann
Date: Thu Jan 19 20:53:49 2012 +0100
Change back to 32 bit (which is hopefully right).
diff --git a/connectivity/source/drivers/dbase/DTable.cxx
b/connectivity/source/drivers/dbase/DTable.cxx
index dde41d2..0386f66 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -1311,7 +1311,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject&
aFile, sal_Bool& bCreateMe
(*m_pFileStream) << cTyp;
if ( nDbaseType == VisualFoxPro )
-(*m_pFileStream) << sal_uInt16(nRecLength-1);
+(*m_pFileStream) << sal_uInt32(nRecLength-1);
else
m_pFileStream->Write(aBuffer, 4);
commit 3c7ad92d43b0823b9f69b0d44e86f674f9dcf070
Author: Stephan Bergmann
Date: Thu Jan 19 15:47:58 2012 +0100
Drop UNO_REF_QUERY[_THROW] duplicates of UNO_QUERY[_THROW].
They are virtually unused (at least the LibO code base has only a
single use of UNO_REF_QUERY) but confuse static analysis tools that
classify unused function parameters as "tags" (which legalizes the
unusedness of those parameters) if they are of an enum type with
exactly one value defined.
diff --git a/cppu/inc/com/sun/star/uno/Reference.h
b/cppu/inc/com/sun/star/uno/Reference.h
index d3611ac..72aecfc 100644
--- a/cppu/inc/com/sun/star/uno/Reference.h
+++ b/cppu/inc/com/sun/star/uno/Reference.h
@@ -140,19 +140,16 @@ public:
inline sal_Bool SAL_CALL operator < ( const BaseReference & rRef ) const
SAL_THROW( () );
};
-/** Enum defining UNO_QUERY and UNO_REF_QUERY for implicit interface query.
+/** Enum defining UNO_QUERY for implicit interface query.
*/
enum UnoReference_Query
{
/** This enum value can be used for implicit interface query.
*/
UNO_QUERY,
-/** This enum value can be used for implicit interface query.
-*/
-UNO_REF_QUERY
};
#ifndef EXCEPTIONS_OFF
-/** Enum defining UNO_QUERY_THROW and UNO_REF_QUERY_THROW for implicit
interface query.
+/** Enum defining UNO_QUERY_THROW for implicit interface query.
If the demanded interface is unavailable, then a RuntimeException is
thrown.
*/
enum UnoReference_QueryThrow
@@ -160,9 +157,6 @@ enum UnoReference_QueryThrow
/** This enum value can be used for implicit interface query.
*/
UNO_QUERY_THROW,
-/** This enum value can be used for implicit interface query.
-*/
-UNO_REF_QUERY_THROW
};
/** Enum defining UNO_SET_THROW for throwing if attempts are made to assign a
null
interface
@@ -176,7 +170,7 @@ enum UnoReference_SetThrow
#endif
/** Template reference class for interface type derived from BaseReference.
-A special constructor given the UNO_QUERY or UNO_REF_QUERY identifier
queries interfaces
+A special constructor given the UNO_QUERY identifier queries interfaces
for reference type.
*/
template< class interface_type >
@@ -287,7 +281,7 @@ public:
/** Constructor: Queries given interface for reference interface type
(interface_type).
@param rRef another reference
-@param dummy UNO_QUERY or UNO_REF_QUERY to force obvious distinction
to other constructors
+@param dummy UNO_QUERY to force obvious distinction to other
constructors
*/
inline Reference( const BaseReference & rRef, UnoReference_Query )
SAL_THROW( (RuntimeException) );
/** Constructor: Queries given interface for reference interface type
(interface_type).
@@ -307,7 +301,7 @@ public:
Throws a RuntimeException if the demanded interface cannot be queried.
@param rRef another reference
-@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious
distinction
+@param dummy UNO_QUERY_THROW to force obvious distinction
to other constructors
*/
inline Reference( const BaseReference & rRef, UnoReference_QueryThrow )
SAL_THROW( (RuntimeException) );
@@ -315,7 +309,7 @@ public:
Throws a RuntimeException if the demanded interface cannot be queried.
@param pInterface an interface pointer
-@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious
distinction
+@param dummy UNO_QUERY_THROW to force obvious distinction
to other constructors
*/
inline Reference( XInterface * pInterface, UnoReference_QueryThrow )
SAL_THROW( (RuntimeException) );
@@ -323,7 +317,7 @@ public:
Throws a RuntimeException if the demanded interface cannot be queried.
@param rAny an any
-@param dummy UNO_QUERY_THROW or UNO_REF_QUERY_THROW to force obvious
distinction
+
[Libreoffice-commits] .: writerfilter/documentation
writerfilter/documentation/ooxml/model.xml |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit 3520d6dfdd3adc9ac328ca9050f796478aaf2020 Author: Miklos Vajna Date: Thu Jan 19 20:48:41 2012 +0100 writerfilter/documentation: describe what an sprm is diff --git a/writerfilter/documentation/ooxml/model.xml b/writerfilter/documentation/ooxml/model.xml index c50f23d..75ee217 100644 --- a/writerfilter/documentation/ooxml/model.xml +++ b/writerfilter/documentation/ooxml/model.xml @@ -9,8 +9,9 @@ it should be nuked from orbit and started again from scratch with a saner design CT_xxx (Complex Type) - it seems to be used for XML elements ST_xxx (Simple Type) - it seems to be used for XML attributes -- SPRM - no idea what that actually means, but in the context of OOXML it seems -to pretty much mean "XML element" +- SPRM (the Sprm structure specified a modification to a property of a +character, paragraph, table, or section in the binary .doc format) - in +the context of OOXML it seems to pretty much mean "XML element" - ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basegfx/inc basegfx/source formula/inc formula/source sc/source unusedcode.easy vcl/source
basegfx/inc/basegfx/color/bcolortools.hxx | 10 - basegfx/inc/basegfx/tools/canvastools.hxx | 15 -- basegfx/source/color/bcolortools.cxx | 38 -- basegfx/source/tools/canvastools.cxx | 78 formula/inc/formula/formdata.hxx |1 formula/inc/formula/formula.hxx|1 formula/inc/formula/token.hxx |2 formula/inc/formula/tokenarray.hxx |2 formula/source/core/api/token.cxx | 29 formula/source/core/inc/core_resource.hxx |7 - formula/source/core/resource/core_resource.cxx |7 - formula/source/ui/dlg/formula.cxx | 151 - formula/source/ui/dlg/funcutl.cxx | 21 --- formula/source/ui/dlg/structpg.cxx | 10 - formula/source/ui/dlg/structpg.hxx |3 sc/source/ui/inc/formula.hxx |2 unusedcode.easy| 31 - vcl/source/gdi/pdfwriter_impl.cxx | 77 vcl/source/gdi/pdfwriter_impl.hxx |1 19 files changed, 486 deletions(-) New commits: commit d93536e52943c910936504e531956f04d9c0503f Author: Thomas Arnhold Date: Thu Jan 19 19:14:49 2012 +0100 remove unused methods diff --git a/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx index 5841f04..0bb0659 100644 --- a/basegfx/inc/basegfx/color/bcolortools.hxx +++ b/basegfx/inc/basegfx/color/bcolortools.hxx @@ -50,16 +50,6 @@ namespace basegfx /// Transform from HSV to RGB BASEGFX_DLLPUBLIC BColor hsv2rgb(const BColor& rHSVColor); -/// Transform from R'G'B' to YIQ (NTSC color model - Y is used in monochrome mode) -BASEGFX_DLLPUBLIC BColor rgb2yiq(const BColor& rRGBColor); -/// Transform from YIQ to R'G'B' (NTSC color model - Y is used in monochrome mode) -BASEGFX_DLLPUBLIC BColor yiq2rgb(const BColor& rYIQColor); - -/// Transform from R'G'B' to Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) -BASEGFX_DLLPUBLIC BColor rgb2ypbpr(const BColor& rRGBColor); -/// Transform from Y'PbPr (the [0,1]x[-.5,.5]x[-.5,.5] equivalent of Y'CbCr (which is scaled into 8bit)) into R'G'B' -BASEGFX_DLLPUBLIC BColor ypbpr2rgb(const BColor& rYPbPrColor); - /// Transform from CIE XYZ into Rec. 709 RGB (D65 white point) BASEGFX_DLLPUBLIC BColor ciexyz2rgb( const BColor& rXYZColor ); /// Transform from Rec. 709 RGB (D65 white point) into CIE XYZ diff --git a/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx index 5884563..ea1924a 100644 --- a/basegfx/inc/basegfx/tools/canvastools.hxx +++ b/basegfx/inc/basegfx/tools/canvastools.hxx @@ -138,7 +138,6 @@ namespace basegfx homMatrixFromAffineMatrix( ::basegfx::B2DHomMatrix& transform, const ::com::sun::star::geometry::AffineMatrix2D&matrix ); -BASEGFX_DLLPUBLIC ::basegfx::B2DHomMatrix homMatrixFromAffineMatrix( const ::com::sun::star::geometry::AffineMatrix2D& matrix ); BASEGFX_DLLPUBLIC ::basegfx::B3DHomMatrix homMatrixFromAffineMatrix3D( const ::com::sun::star::geometry::AffineMatrix3D& matrix ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::Matrix2D& @@ -157,17 +156,13 @@ namespace basegfx BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle2D rectangle2DFromB2DRectangle( const ::basegfx::B2DRange& ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::RealRectangle3D rectangle3DFromB3DRectangle( const ::basegfx::B3DRange& ); -BASEGFX_DLLPUBLIC ::basegfx::B2DVector b2DSizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2DPoint b2DPointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); BASEGFX_DLLPUBLIC ::basegfx::B2DRange b2DRectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); BASEGFX_DLLPUBLIC ::basegfx::B3DRange b3DRectangleFromRealRectangle3D( const ::com::sun::star::geometry::RealRectangle3D& ); BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerSize2D integerSize2DFromB2ISize( const ::basegfx::B2IVector& ); -BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerPoint2D integerPoint2DFromB2IPoint( const ::basegfx::B2IPoint& ); -BASEGFX_DLLPUBLIC ::com::sun::star::geometry::IntegerRectangle2D integerRectangle2DFromB2IRectangle( const ::basegfx::B2IRange& ); BASEGFX_DLLPUBLIC ::basegfx::B2IVector b2ISizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); -BASEGFX_DLLPUBLIC ::basegfx::B2IPoint b2IPointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); BASE
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - cppu/source sc/inc sc/source solenv/gbuild
cppu/source/threadpool/thread.cxx| 25 ++
cppu/source/threadpool/thread.hxx|2
sc/inc/global.hxx|1
sc/source/core/data/global.cxx |5
sc/source/core/data/table4.cxx | 232 +--
sc/source/ui/docshell/docfunc.cxx|4
sc/source/ui/miscdlgs/scuiautofmt.cxx|4
sc/source/ui/unoobj/afmtuno.cxx | 88 --
sc/source/ui/unoobj/cellsuno.cxx |4
sc/source/ui/view/cellsh3.cxx|4
solenv/gbuild/platform/unxgcc_gdbforjunit.sh |2
11 files changed, 190 insertions(+), 181 deletions(-)
New commits:
commit e2dda69cfe9925e6f5d2bc922febb53a0f69c50f
Author: Stephan Bergmann
Date: Fri Dec 16 13:56:32 2011 +0100
Report backtraces for all threads.
(cherry picked from commit 54a918bbfba47734d414832755e35434da103ed5)
Signed-off-by: Michael Stahl
diff --git a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
index 730d2e9..0341e7b 100755
--- a/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
+++ b/solenv/gbuild/platform/unxgcc_gdbforjunit.sh
@@ -44,7 +44,7 @@ then
echo "Found a core dump at ${COREFILE}"
echo "Stacktrace:"
GDBCOMMANDFILE=`mktemp`
-echo "bt" > ${GDBCOMMANDFILE}
+echo "thread apply all bt" > ${GDBCOMMANDFILE}
gdb -x $GDBCOMMANDFILE --batch ${OFFICEFILE}.bin ${COREFILE}
rm ${GDBCOMMANDFILE}
echo
commit c77a382e27d6ecabd98fa4788b4a372008fe7dbf
Author: Stephan Bergmann
Date: Wed Jan 11 09:26:41 2012 +0100
ScGlobal::GetAutoFormat not always required to create fresh instance.
...at least in ~ScAutoFormatObj it appears unnecessary and can lead to
crashes during Desktop::DeregisterServices (when ScGlobal::ppRscString
is already null and ScAutoFormat ctor calls ScGlobal::GetRscString).
Therefore split GetAutoFormat in two, GetOrCreateAutoFormat for cases
that probably need a non-null return and GetAutoFormat for those that
are OK with a null return.
(cherry picked from commit 0e4b36269097f8865bdbc1b9d299a2776ae0cc06)
Signed-off-by: Michael Stahl
Signed-off-by: Stephan Bergmann
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a810400..ac10094 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -562,6 +562,7 @@ public:
SC_DLLPUBLIC static const SvxSearchItem&GetSearchItem();
SC_DLLPUBLIC static voidSetSearchItem( const
SvxSearchItem& rNew );
SC_DLLPUBLIC static ScAutoFormat* GetAutoFormat();
+SC_DLLPUBLIC static ScAutoFormat* GetOrCreateAutoFormat();
static void ClearAutoFormat(); //BugId 54209
static FuncCollection* GetFuncCollection();
SC_DLLPUBLIC static ScUnoAddInCollection* GetAddInCollection();
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 6de3782..c43a853 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -299,6 +299,11 @@ void ScGlobal::ClearAutoFormat()
ScAutoFormat* ScGlobal::GetAutoFormat()
{
+return pAutoFormat;
+}
+
+ScAutoFormat* ScGlobal::GetOrCreateAutoFormat()
+{
if ( !pAutoFormat )
{
pAutoFormat = new ScAutoFormat;
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index 9b38214..bc99c5c 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -1592,14 +1592,10 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL
nCol2, SCROW nRow2,
void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
SCROW nEndRow,
const ScPatternAttr& rAttr, sal_uInt16
nFormatNo)
{
-ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat();
-if (pAutoFormat)
+ScAutoFormatData* pData = (*ScGlobal::GetOrCreateAutoFormat())[nFormatNo];
+if (pData)
{
-ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo];
-if (pData)
-{
-ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr);
-}
+ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr);
}
}
@@ -1608,140 +1604,136 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW
nStartRow, SCCOL nEndCol, SCROW
{
if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow))
{
-ScAutoFormat* pAutoFormat = ScGlobal::GetAutoFormat();
-if (pAutoFormat)
+ScAutoFormatData* pData =
(*ScGlobal::GetOrCreateAutoFormat())[nFormatNo];
+if (pData)
{
-ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo];
-if (pData)
+ScPatternAttr* pPatternAttrs[16];
+for (sal_uInt8 i = 0; i < 16; ++i)
+{
+pPatternAttrs[i] = new ScPatternAttr(pDocument->GetPool());
+pData->FillToI
[Libreoffice-commits] .: sd/source svx/source sw/source
sd/source/filter/eppt/eppt.cxx |2 +-
sd/source/filter/eppt/epptso.cxx |4 ++--
svx/source/gallery2/gallery1.cxx |2 +-
sw/source/filter/ww8/rtfexport.cxx |2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 4229f1b186b84ab36d97b723a6a1f81e79d40d82
Author: Michael Meeks
Date: Thu Jan 19 17:08:47 2012 +
WaE: ongoing stream operator cleanup, persuade ints they are sal_Int32s
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 7da27aa..1f7606f 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1457,7 +1457,7 @@ sal_Bool PPTWriter::ImplWriteAtomEnding()
mpStrm->Seek( nOfs ); // Fill the VBAInfoAtom with
the correct index to the persisttable
*mpStrm << nPersistEntrys
<< n1
-<< 2;
+<< sal_Int32(2);
mpStrm->Seek( nOldPos );
}
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 7949538..2e5102b 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -255,7 +255,7 @@ sal_uInt32 PPTWriter::ImplOutlineViewInfoContainer(
SvStream* pStrm )
<< (sal_uInt32)( EPP_ViewInfoAtom << 16 ) << (sal_uInt32)52
<< (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 <<
(sal_Int32)200 // scaling atom - Keeps the current scale
<< (sal_Int32)170 << (sal_Int32)200 << (sal_Int32)170 <<
(sal_Int32)200 // scaling atom - Keeps the previous scale
- << (sal_Int32)0x17ac << 0xdda// Origin - Keeps the origin
in master coordinates
+ << (sal_Int32)0x17ac << (sal_Int32)0xdda// Origin - Keeps
the origin in master coordinates
<< (sal_Int32)-780 << (sal_Int32)-84 // Origin
<< (sal_uInt8)1 // bool1 varScale - Set if
zoom to fit is set
<< (sal_uInt8)0 // bool1 draftMode - Not used
@@ -1151,7 +1151,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut,
int nTextInstance, sal_u
PPTExParaSheet& rParaSheet = mpStyleSheet->GetParaSheet( nTextInstance );
rOut << (sal_uInt32)( ( EPP_TextHeaderAtom << 16 ) | ( nAtomInstance << 4
) ) << (sal_uInt32)4
- << nTextInstance;
+ << sal_Int32(nTextInstance);
if ( mbEmptyPresObj )
mnTextSize = 0;
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 64a94ab..0ac9fab 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -285,7 +285,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject&
rBaseURL, sal_Bool& rbDirIsR
if( pTestStm )
{
-*pTestStm << 1;
+*pTestStm << sal_Int32(1);
if( pTestStm->GetError() )
rbDirIsReadOnly = sal_True;
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 8534f82..6a9679f 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -715,7 +715,7 @@ bool RtfExport::DisallowInheritingOutlineNumbering( const
SwFmt& rFmt )
if (((const
SwTxtFmtColl*)pParent)->IsAssignedToListLevelOfOutlineStyle())
{
// Level 9 disables the outline
-Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << 9;
+Strm() << OOO_STRING_SVTOOLS_RTF_LEVEL << sal_Int32(9);
bRet = true;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/osl
sal/inc/osl/detail/file.h |6 --
sal/osl/unx/file_stat.cxx | 20 ++--
2 files changed, 10 insertions(+), 16 deletions(-)
New commits:
commit c5d4f4967e5d9d0220fadf3f313ddc35002cdf27
Author: Michael Meeks
Date: Thu Jan 19 17:03:16 2012 +
implement inode compare for identical directory item checking
diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h
index 065c355..e6a6671 100644
--- a/sal/inc/osl/detail/file.h
+++ b/sal/inc/osl/detail/file.h
@@ -49,12 +49,6 @@ extern "C" {
#define osl_File_OpenFlag_Trunc 0x0010L
#define osl_File_OpenFlag_NoExcl0x0020L
-/* Compare directory items for being the same underlying file
- * this unwinds unix hard-links and symlinks etc.
- */
-
-SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(oslDirectory a,
oslDirectory b);
-
/* Get the OS specific "handle" of an open file. */
SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
oslFileHandle Handle,
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 320744f..e5fc091 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -461,17 +461,17 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a,
oslDirectoryItem b)
pB->m_ustrFilePath->buffer, pB->m_ustrFilePath->length ) == 0)
return sal_True;
-fprintf (stderr, "We have to do an inode compare !\n");
-/*
-int rc = stat_c( cpFilePath, statb );
+#if defined(__GNUC__) && (__GNUC__ < 3)
+struct ::stat a_stat, b_stat;
+#else
+struct stat a_stat, b_stat;
+#endif
-Stat.st_ino == ...
-if (rc == -1)
-return oslTranslateFileError(OSL_FET_ERROR, errno);
-else
-return osl_File_E_None;
-*/
-return sal_False;
+if (osl::lstat(rtl::OUString(pA->m_ustrFilePath), a_stat) != 0 ||
+osl::lstat(rtl::OUString(pB->m_ustrFilePath), b_stat) != 0)
+return sal_False;
+
+return (a_stat.st_ino == b_stat.st_ino);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'distro/ubuntu/oneiric-3.4'
New branch 'distro/ubuntu/oneiric-3.4' available with the following commits: commit 3129d7d23d06ac9609957d141cedbc04ac42c48a Author: Caolán McNamara Date: Tue Dec 13 21:01:28 2011 + Resolves: rhbz#761009 IFSD_Equal is asymmetrical commit 6a98980289ecc5b21a9c1044ca22e8de4f8f9c93 Author: Bjoern Michaelsen Date: Thu Aug 25 00:23:31 2011 +0200 lp#832121: libgcc_s magic breaks horribly on armel and powerpc commit 1518416ac6a692c2234dfa3cb4b98a382ebe65cc Author: Bjoern Michaelsen Date: Wed Jun 29 19:20:43 2011 +0200 lp#746375: soffice.bin crashed with SIGSEGV in uno_type_sequence_construct() commit 9d3fb278999edb233eb1c2612412a06cd150e396 Author: Bjoern Michaelsen Date: Wed Jun 29 19:15:31 2011 +0200 lp#720716: more translations in desktop files commit 2c1ac0ff6558bd2b3dafe79a76a5fbaaa6507ba3 Author: Bjoern Michaelsen Date: Wed Jun 29 19:49:36 2011 +0200 apply ubuntu-palette.diff commit 4441ba7add7cd954b7f9077585d10033cc4ded2b Author: Bjoern Michaelsen Date: Tue Jul 19 13:16:14 2011 +0200 disable default as-needed on linking for gbuild too * for not breaking pkg-config provided link switches (because of order) commit 903c82fa3bfeafe33965ca5d38c4ff144dbad572 Author: Bjoern Michaelsen Date: Sun Jul 3 11:37:02 2011 +0200 adding human theme to scp2 commit 83eed6f49ede0f7b60d3b19e9cc558a90c762ecc Author: Bjoern Michaelsen Date: Fri Jul 1 10:45:59 2011 +0200 disable default as-needed on linking * for not breaking pkg-config provided link switches (because of order) commit 1821350817000893ed9643f3081fca225ca151c2 Author: Rene Engelhard Date: Thu Jun 30 10:18:47 2011 +0200 apply system-lpsolve-rpath.diff from libreoffice-build ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'distro/ubuntu/oneiric-3.4' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f150e63a4df2f4dccc6eeeac3a2462429ebc4c2 Author: Rene Engelhard Date: Thu Jan 19 15:19:42 2012 +0100 honour JAVAFLAGS in gbuild diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index cea27c0..d8c648e 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := ifneq ($(gb_DEBUGLEVEL),0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/JavaClassSet.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 80a1001a206a3e3b6bf83b9734580cc7f46b0e33 Author: Rene Engelhard Date: Thu Jan 19 15:19:42 2012 +0100 honour JAVAFLAGS in gbuild diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 6befda1..6fd19fe 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,7 @@ # #* -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS) gb_JavaClassSet_JAVACDEBUG := ifneq ($(gb_DEBUGLEVEL),0) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/sbx/sbxvalue.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 35b5cc9522a1c496a432b49534b1b202f99113e0
Author: Tor Lillqvist
Date: Thu Jan 19 16:16:57 2012 +0200
Fix SvStream::operator>> problem that showed up with the Android gcc 4.4.3
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index c6c95dc..e67335c 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1566,8 +1566,11 @@ sal_Bool SbxValue::LoadData( SvStream& r, sal_uInt16 )
// Match the Int on this system?
if( n > SAL_TYPES_SIZEOFINT )
r >> aData.nLong, aData.eType = SbxLONG;
-else
-r >> aData.nInt;
+else {
+sal_Int32 nInt;
+r >> nInt;
+aData.nInt = nInt;
+}
break;
}
case SbxUINT:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/util tools/source
sal/inc/osl/file.h | 24
sal/inc/osl/file.hxx| 26 +-
sal/util/sal.map|2 +-
tools/source/stream/strmunx.cxx |2 +-
4 files changed, 51 insertions(+), 3 deletions(-)
New commits:
commit 13a752cdbb9e2c1e2c0f922158f03fc70c12245c
Author: Michael Meeks
Date: Thu Jan 19 14:01:33 2012 +
sal: expose a public API for comparing directory items
Windows impl. still pending.
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index 0e0d765..3bcd877 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -316,6 +316,30 @@ SAL_DLLPUBLIC oslFileError SAL_CALL
osl_acquireDirectoryItem(
SAL_DLLPUBLIC oslFileError SAL_CALL osl_releaseDirectoryItem(
oslDirectoryItem Item );
+/** Determine if two directory items point the the same underlying file
+
+The comparison is done first by URL, and then by resolving links to
+find the target, and finally by comparing inodes on unix.
+
+@param pItemA [in]
+A directory handle to compare with another handle
+
+@param pItemB [in]
+A directory handle to compare with pItemA
+
+@return
+sal_True: if the items point to an identical resource
+sal_False: if the items point to a different resource, or a fatal error
occured
+
+@see osl_getDirectoryItem()
+
+@since LibreOffice 3.6
+*/
+
+SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(
+oslDirectoryItem pItemA,
+oslDirectoryItem pItemB );
+
/* File types */
typedef enum {
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index d9a1d89..85393f5 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -1389,9 +1389,9 @@ public:
class DirectoryItem: public FileBase
{
+oslDirectoryItem _pData;
public:
-oslDirectoryItem _pData;
/** Constructor.
*/
@@ -1529,6 +1529,30 @@ public:
return (RC) osl_getFileStatus( _pData, &rStatus._aStatus,
rStatus._nMask );
}
+/** Determine if two directory items point the the same underlying file
+
+The comparison is done first by URL, and then by resolving links to
+find the target, and finally by comparing inodes on unix.
+
+@param pItemA [in]
+A directory handle to compare with another handle
+
+@param pItemB [in]
+A directory handle to compare with pItemA
+
+@return
+sal_True: if the items point to an identical resource
+sal_False: if the items point to a different resource, or a fatal error
occured
+
+@see osl_getDirectoryItem()
+
+@since LibreOffice 3.6
+*/
+inline sal_Bool isIdenticalTo( const DirectoryItem &pOther )
+{
+return osl_identicalDirectoryItem( _pData, pOther._pData );
+}
+
friend class Directory;
};
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 02610f5..1e9753b 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -613,6 +613,7 @@ LIBO_UDK_3.5 { # symbols available in >= LibO 3.5
LIBO_UDK_3.6 { # symbols available in >= LibO 3.6
global:
osl_unmapMappedFile;
+osl_identicalDirectoryItem;
} UDK_3.10;
PRIVATE_1.0 {
@@ -647,7 +648,6 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
PRIVATE_file.1 { # LibreOffice 3.6
global:
-osl_identicalDirectoryItem;
osl_getFileOSHandle;
};
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 850eedc..031aaa5 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -146,7 +146,7 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart,
sal_Size nEnd, SvFileStr
for( size_t i = 0; i < rLockList.size(); ++i )
{
pLock = rLockList[ i ];
-if( osl_identicalDirectoryItem( aItem._pData, pLock->m_aItem._pData) )
+if( aItem.isIdenticalTo( pLock->m_aItem ) )
{
sal_Bool bDenyByOptions = sal_False;
StreamMode nLockMode = pLock->m_pStream->GetStreamMode();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sw/source sw/uiconfig writerfilter/documentation writerfilter/source
sw/source/core/layout/tabfrm.cxx |5 --- writerfilter/documentation/ooxml/model.xml | 41 + writerfilter/source/ooxml/model.xml|2 - 3 files changed, 42 insertions(+), 6 deletions(-) New commits: commit 9f03ad248e2e0151facadee0738a7fa6158743f9 Author: LuboÅ¡ LuÅák Date: Thu Jan 19 14:22:27 2012 +0100 a feeble attempt at at least some docs for writerfilter diff --git a/writerfilter/documentation/ooxml/model.xml b/writerfilter/documentation/ooxml/model.xml new file mode 100644 index 000..c50f23d --- /dev/null +++ b/writerfilter/documentation/ooxml/model.xml @@ -0,0 +1,41 @@ +These are various notes about ooxml/model.xml and related stuff. They have been +mostly found out by trial and error, because existing documentation is poor +or nonexistent, so I don't actually understand writerfilter that much (and +think nothing nice about it) and don't think it (both writerfilter and my +understanding/liking of it) could be noticeably improved. In an ideal world +it should be nuked from orbit and started again from scratch with a saner design. + +- +CT_xxx (Complex Type) - it seems to be used for XML elements +ST_xxx (Simple Type) - it seems to be used for XML attributes + +- SPRM - no idea what that actually means, but in the context of OOXML it seems +to pretty much mean "XML element" + +- + +Format of the tag (shortened CT_Font example): + + + + + + +CT_Font is the type that is defined how it will be handled. +resource="XXX" means it will be handled by OOXMLFastContextHandlerXXX class +no idea what tag="font" means or if it matters + defines the subelement will be handled in sprm() function +as NS_ooxml::LN_CT_Font_charset case + defines the attribute of the element will be handled +in attribute() function as NS_ooxml::LN_CT_Font_name case +in both cases sprm()/attribute() may mean actually any of the various strange +naming ideas like lcl_sprm() + +- +If an element (and its subelements) are not processed but the element itself +does not require any special handling, make sure something like the below is present. +Otherwise null context will be created and the element and all its subelements +will be ignored. + + + commit 58de34f6330e7093238bae2a14982e598867b336 Author: LuboÅ¡ LuÅák Date: Wed Jan 18 18:08:26 2012 +0100 fix reading w:charset, you misdesigned writerfilter monster (fdo#34814) diff --git a/writerfilter/source/ooxml/model.xml b/writerfilter/source/ooxml/model.xml index 39ecf66..4dc8c49 100644 --- a/writerfilter/source/ooxml/model.xml +++ b/writerfilter/source/ooxml/model.xml @@ -20473,7 +20473,7 @@ - + commit 38fea73760e675dc04e0c20f3e01e50aa8b03767 Author: LuboÅ¡ LuÅák Date: Tue Jan 17 14:28:38 2012 +0100 remove executable bit on source files diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx old mode 100755 new mode 100644 diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src old mode 100755 new mode 100644 diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx old mode 100755 new mode 100644 diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml old mode 100755 new mode 100644 diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml old mode 100755 new mode 100644 commit 254ba40392b17c2cb2fa1ef35a835d19a5f4a5e1 Author: LuboÅ¡ LuÅák Date: Mon Jan 16 17:42:39 2012 +0100 remove pointless forward moving of a table (bnc#706138) This appears to be broken. Why should a table where all rows want to be kept together be moved one page forward just because there is something before it on the page where it is? It either fits its curent page, in which case it's wrong, or it does not fit, in which case it may not fit the following page either and something else needs to take care of it anyway. diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 1571b71..ec32c68 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -2404,11 +2404,6 @@ void SwTabFrm::MakeAll() ++nMinNumOfLines; pTmpRow = static_cast(pTmpRow->GetNext()); } -// Check if all lines want to keep together an
[Libreoffice-commits] .: tools/source
tools/source/stream/strmunx.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 5785734a1947c6b3fb2081b7e33fe3d0bd125bbb
Author: Tor Lillqvist
Date: Thu Jan 19 15:18:20 2012 +0200
Don't use too modern C++
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index d2135fa..850eedc 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -710,13 +710,13 @@ void SvFileStream::Open( const String& rFilename,
StreamMode nOpenMode )
osl::FileStatus aStatus( osl_FileStatus_Mask_Type |
osl_FileStatus_Mask_LinkTargetURL );
// FIXME: we really need to switch to a pure URL model ...
-if ( osl::File::getFileURLFromSystemPath( aFilename, aFileURL ) !=
osl::FileBase::RC::E_None )
+if ( osl::File::getFileURLFromSystemPath( aFilename, aFileURL ) !=
osl::FileBase::E_None )
aFileURL = aFilename;
-bool bStatValid = ( osl::DirectoryItem::get( aFileURL, aItem) !=
osl::FileBase::RC::E_None &&
-aItem.getFileStatus( aStatus ) !=
osl::FileBase::RC::E_None );
+bool bStatValid = ( osl::DirectoryItem::get( aFileURL, aItem) !=
osl::FileBase::E_None &&
+aItem.getFileStatus( aStatus ) !=
osl::FileBase::E_None );
// SvFileStream can't open a directory
-if( bStatValid && aStatus.getFileType() ==
osl::FileStatus::Type::Directory )
+if( bStatValid && aStatus.getFileType() == osl::FileStatus::Directory )
{
SetError( ::GetSvError( EISDIR ) );
return;
@@ -742,11 +742,11 @@ void SvFileStream::Open( const String& rFilename,
StreamMode nOpenMode )
{
if ( nOpenMode & STREAM_COPY_ON_SYMLINK )
{
-if ( bStatValid && aStatus.getFileType() ==
osl::FileStatus::Type::Link &&
+if ( bStatValid && aStatus.getFileType() == osl::FileStatus::Link
&&
aStatus.getLinkTargetURL().getLength() > 0 )
{
// delete the symbolic link, and replace it with the contents
of the link
-if (osl::File::remove( aFileURL ) == osl::FileBase::RC::E_None
)
+if (osl::File::remove( aFileURL ) == osl::FileBase::E_None )
{
File::copy( aStatus.getLinkTargetURL(), aFileURL );
#if OSL_DEBUG_LEVEL > 0
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/osl sal/util tools/inc tools/source
sal/inc/osl/detail/file.h | 12 --
sal/inc/osl/file.h |1
sal/osl/unx/file.cxx|2 -
sal/osl/unx/file_stat.cxx | 12 --
sal/util/sal.map|2 -
tools/inc/tools/stream.hxx |4 +-
tools/source/stream/strmunx.cxx | 71 +++-
7 files changed, 38 insertions(+), 66 deletions(-)
New commits:
commit 4a086fca7b0a77c20bc9f1c97507966e2861f3da
Author: Michael Meeks
Date: Thu Jan 19 12:23:23 2012 +
fix SvStream to not require a custom open or lstat method.
diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h
index 108d230..065c355 100644
--- a/sal/inc/osl/detail/file.h
+++ b/sal/inc/osl/detail/file.h
@@ -49,25 +49,13 @@ extern "C" {
#define osl_File_OpenFlag_Trunc 0x0010L
#define osl_File_OpenFlag_NoExcl0x0020L
-/* Variant of osl_openFile that takes the file pathname directly as a
- char*
-*/
-
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
-const char *cpFilePath,
-oslFileHandle *pHandle,
-sal_uInt32 uFlags );
-
/* Compare directory items for being the same underlying file
* this unwinds unix hard-links and symlinks etc.
*/
SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(oslDirectory a,
oslDirectory b);
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_lstatFilePath( const char *cpFilePath,
struct stat *statb );
-
/* Get the OS specific "handle" of an open file. */
-
SAL_DLLPUBLIC oslFileError SAL_CALL osl_getFileOSHandle(
oslFileHandle Handle,
sal_IntPtr *piFileHandle );
diff --git a/sal/inc/osl/file.h b/sal/inc/osl/file.h
index 2a8cf37..0e0d765 100644
--- a/sal/inc/osl/file.h
+++ b/sal/inc/osl/file.h
@@ -664,6 +664,7 @@ typedef void *oslFileHandle;
#define osl_File_OpenFlag_Write 0x0002L
#define osl_File_OpenFlag_Create0x0004L
#define osl_File_OpenFlag_NoLock0x0008L
+/* larger bit-fields reserved for internal use cf. detail/file.h */
/** Open a regular file.
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 64ce977..7bb6bae 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -892,7 +892,7 @@ SAL_CALL osl_openMemoryAsFile( void *address, size_t size,
oslFileHandle *pHandl
#define OPEN_CREATE_FLAGS ( O_CREAT | O_RDWR )
#endif
-oslFileError
+static oslFileError
SAL_CALL osl_openFilePath( const char *cpFilePath, oslFileHandle* pHandle,
sal_uInt32 uFlags )
{
oslFileError eRet;
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 0477a52..320744f 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -462,7 +462,6 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a,
oslDirectoryItem b)
return sal_True;
fprintf (stderr, "We have to do an inode compare !\n");
-
/*
int rc = stat_c( cpFilePath, statb );
@@ -475,15 +474,4 @@ SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a,
oslDirectoryItem b)
return sal_False;
}
-oslFileError
-SAL_CALL osl_lstatFilePath( const char *cpFilePath, struct stat *statb )
-{
-int rc = lstat_c( cpFilePath, statb );
-
-if (rc == -1)
-return oslTranslateFileError(OSL_FET_ERROR, errno);
-else
-return osl_File_E_None;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 26c30fc..02610f5 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -647,9 +647,7 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
PRIVATE_file.1 { # LibreOffice 3.6
global:
-osl_openFilePath;
osl_identicalDirectoryItem;
-osl_lstatFilePath;
osl_getFileOSHandle;
};
diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 37b7c3f..8c7fa0c 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -576,10 +576,10 @@ class TOOLS_DLLPUBLIC SvFileStream : public SvStream
friend class FileCopier;
private:
-StreamData* pInstanceData;
+StreamData* pInstanceData;
String aFilename;
sal_uInt16 nLockCounter;
-sal_BoolbIsOpen;
+sal_BoolbIsOpen;
sal_uInt32 GetFileHandle() const;
// Forbidden and not implemented.
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 0fcddbd..d2135fa 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -223,7 +223,7 @@ class StreamData
public:
oslFileHandle rHandle;
-StreamData() { }
+StreamData() : rHandle( 0 ) { }
};
// ---
@@ -683,8 +683,6 @@ void SvFileStream::Open( const String& rFilename,
StreamMode nOpenMode )
{
sal_uInt32 uFlags;
oslFileHandle nHandleTmp;
-struct stat buf;
-sal_Bool bStatValid = sal_False;
Close();
errno = 0;
@@ -707,16 +705,22 @@ void SvFileStream::Open( const String& rFilename,
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sal/systools
sal/systools/win32/uwinapi/legacy.cpp | 46 +
sal/systools/win32/uwinapi/makefile.mk |5 +++
sal/systools/win32/uwinapi/uwinapi.dxp | 25 +
3 files changed, 76 insertions(+)
New commits:
commit d823fef9b9f7ad0d0dcd834a3f2c47c3f018f523
Author: Fridrich Å trba
Date: Thu Jan 19 02:13:47 2012 -0700
Make older Duden Korrektor work with LO (fdo#37561)
signed-off-by: Michael Meeks
Signed-off-by: Fridrich Å trba
diff --git a/sal/systools/win32/uwinapi/legacy.cpp
b/sal/systools/win32/uwinapi/legacy.cpp
new file mode 100755
index 000..2218d1d
--- /dev/null
+++ b/sal/systools/win32/uwinapi/legacy.cpp
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Fridrich Strba
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#define WIN32_LEAN_AND_MEAN
+#include
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#pragma warning(disable:4273) // inconsistent dll linkage
+#endif
+
+EXTERN_C DWORD WINAPI GetShortPathNameW(LPCWSTR lpszLongPath,LPWSTR
lpszShortPath,DWORD cchBuffer)
+{
+typedef DWORD (WINAPI * GetShortPathNameW_t) (LPCWSTR,LPWSTR,DWORD);
+
+GetShortPathNameW_t p_GetShortPathNameW =
+(GetShortPathNameW_t) GetProcAddress (
+GetModuleHandle ("kernel32.dll"), "GetShortPathNameW");
+
+if (p_GetShortPathNameW)
+return p_GetShortPathNameW(lpszLongPath,lpszShortPath,cchBuffer);
+else
+return 0;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/systools/win32/uwinapi/makefile.mk
b/sal/systools/win32/uwinapi/makefile.mk
index 0989b61..7b5c93b 100644
--- a/sal/systools/win32/uwinapi/makefile.mk
+++ b/sal/systools/win32/uwinapi/makefile.mk
@@ -48,6 +48,7 @@ CFLAGSCXX+=-Wno-unused-parameter -Wno-return-type
.ENDIF
SLOFILES=\
+$(SLO)$/legacy.obj\
$(SLO)$/snprintf.obj\
$(SLO)$/snwprintf.obj
@@ -55,6 +56,10 @@ SHL1TARGET=$(TARGET)
SHL1IMPLIB=$(SHL1TARGET)
SHL1DEF=$(MISC)/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
+.IF "$(COM)"=="MSC"
+DEF1EXPORTFILE=\
+$(SHL1TARGET).dxp
+.ENDIF
DEF1DEPN=\
$(DEF1EXPORTFILE)\
makefile.mk
diff --git a/sal/systools/win32/uwinapi/uwinapi.dxp
b/sal/systools/win32/uwinapi/uwinapi.dxp
new file mode 100755
index 000..0eeb2a3
--- /dev/null
+++ b/sal/systools/win32/uwinapi/uwinapi.dxp
@@ -0,0 +1,25 @@
+;
+; Version: MPL 1.1 / GPLv3+ / LGPLv3+
+;
+; The contents of this file are subject to the Mozilla Public License Version
+; 1.1 (the "License"); you may not use this file except in compliance with
+; the License or as specified alternatively below. You may obtain a copy of
+; the License at http://www.mozilla.org/MPL/
+;
+; Software distributed under the License is distributed on an "AS IS" basis,
+; WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+; for the specific language governing rights and limitations under the
+; License.
+;
+; The Initial Developer of the Original Code is
+; Fridrich Strba
+;
+; Alternatively, the contents of this file may be used under the terms of
+; either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+; the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+; in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+; instead of those above.
+;
+;*
+
+GetShortPathNameW
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/source
tools/source/stream/strmunx.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 755f299eccee79aa91ce6d935b85d2b00fe74974
Author: Tor Lillqvist
Date: Thu Jan 19 14:01:45 2012 +0200
C++ is a nicely standardized language
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 8b47282..0fcddbd 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -126,19 +126,19 @@ sal_Bool InternalStreamLock::LockFile( sal_Size nStart,
sal_Size nEnd, SvFileStr
osl::MutexGuard aGuard( LockMutex::get() );
#endif
osl::DirectoryItem aItem;
-if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) !=
osl::FileBase::RC::E_None )
+if (osl::DirectoryItem::get( pStream->GetFileName(), aItem) !=
osl::FileBase::E_None )
{
SAL_INFO("tools", "Failed to lookup stream for locking");
return sal_True;
}
osl::FileStatus aStatus( osl_FileStatus_Mask_Type );
-if ( aItem.getFileStatus( aStatus ) != osl::FileBase::RC::E_None )
+if ( aItem.getFileStatus( aStatus ) != osl::FileBase::E_None )
{
SAL_INFO("tools", "Failed to stat stream for locking");
return sal_True;
}
-if( aStatus.getFileType() == osl::FileStatus::Type::Directory )
+if( aStatus.getFileType() == osl::FileStatus::Directory )
return sal_True;
InternalStreamLock* pLock = NULL;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/inc sal/osl sal/util tools/source
sal/inc/osl/detail/file.h | 14 +-
sal/inc/osl/file.hxx|2 +-
sal/osl/unx/file_stat.cxx | 20 ++--
sal/util/sal.map|2 +-
tools/source/stream/strmunx.cxx | 37 ++---
5 files changed, 47 insertions(+), 28 deletions(-)
New commits:
commit 0c17acbb321ced2afe2f0ff6769291549838ebaa
Author: Michael Meeks
Date: Thu Jan 19 11:05:51 2012 +
fix SvStream to not disagree with sal on sizeof struct stat
A temporary tweak to restore build-ability; the oslDirectory
change needs a little more thought & public exposure, but rsc
no longer crashes during compile ...
diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h
index 19415a2..108d230 100644
--- a/sal/inc/osl/detail/file.h
+++ b/sal/inc/osl/detail/file.h
@@ -58,17 +58,13 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath(
oslFileHandle *pHandle,
sal_uInt32 uFlags );
-/* Wrappers for stat() and lstat() with Android-specific hook
- for files inside the .apk.
-*/
+/* Compare directory items for being the same underlying file
+ * this unwinds unix hard-links and symlinks etc.
+ */
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_statFilePath(
-const char *cpFilePath,
-struct stat *statb );
+SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(oslDirectory a,
oslDirectory b);
-SAL_DLLPUBLIC oslFileError SAL_CALL osl_lstatFilePath(
-const char *cpFilePath,
-struct stat *statb );
+SAL_DLLPUBLIC oslFileError SAL_CALL osl_lstatFilePath( const char *cpFilePath,
struct stat *statb );
/* Get the OS specific "handle" of an open file. */
diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx
index e64e2f0..d9a1d89 100644
--- a/sal/inc/osl/file.hxx
+++ b/sal/inc/osl/file.hxx
@@ -1389,9 +1389,9 @@ public:
class DirectoryItem: public FileBase
{
-oslDirectoryItem _pData;
public:
+oslDirectoryItem _pData;
/** Constructor.
*/
diff --git a/sal/osl/unx/file_stat.cxx b/sal/osl/unx/file_stat.cxx
index 9cbb39a..0477a52 100644
--- a/sal/osl/unx/file_stat.cxx
+++ b/sal/osl/unx/file_stat.cxx
@@ -448,15 +448,31 @@ oslFileError SAL_CALL osl_setFileTime (
return osl_psz_setFileTime( path, pCreationTime, pLastAccessTime,
pLastWriteTime );
}
-oslFileError
-SAL_CALL osl_statFilePath( const char *cpFilePath, struct stat *statb )
+sal_Bool
+SAL_CALL osl_identicalDirectoryItem( oslDirectoryItem a, oslDirectoryItem b)
{
+DirectoryItem_Impl *pA = (DirectoryItem_Impl *) a;
+DirectoryItem_Impl *pB = (DirectoryItem_Impl *) b;
+if (a == b)
+return sal_True;
+/* same name => same item, unless renaming / moving madness has occurred */
+if (rtl_ustr_compare_WithLength(
+pA->m_ustrFilePath->buffer, pA->m_ustrFilePath->length,
+pB->m_ustrFilePath->buffer, pB->m_ustrFilePath->length ) == 0)
+return sal_True;
+
+fprintf (stderr, "We have to do an inode compare !\n");
+
+/*
int rc = stat_c( cpFilePath, statb );
+Stat.st_ino == ...
if (rc == -1)
return oslTranslateFileError(OSL_FET_ERROR, errno);
else
return osl_File_E_None;
+*/
+return sal_False;
}
oslFileError
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 879d252..26c30fc 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -648,7 +648,7 @@ PRIVATE_textenc.1 { # LibreOffice 3.6
PRIVATE_file.1 { # LibreOffice 3.6
global:
osl_openFilePath;
-osl_statFilePath;
+osl_identicalDirectoryItem;
osl_lstatFilePath;
osl_getFileOSHandle;
};
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index c9d4f07..8b47282 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -64,10 +64,10 @@ namespace { struct LockMutex : public rtl::Static<
osl::Mutex, LockMutex > {}; }
class InternalStreamLock
{
-sal_Sizem_nStartPos;
-sal_Sizem_nEndPos;
-SvFileStream* m_pStream;
-struct stat m_aStat;
+sal_Size m_nStartPos;
+sal_Size m_nEndPos;
+SvFileStream* m_pStream;
+osl::DirectoryItem m_aItem;
InternalStreamLock( sal_Size, sal_Size, SvFileStream* );
~InternalStreamLock();
@@ -87,11 +87,11 @@ InternalStreamLock::InternalStreamLock(
m_nEndPos( nEnd ),
m_pStream( pStream )
{
-rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
-osl_getThreadTextEncoding()));
-osl_statFilePath( aFileName.getStr(), &m_aStat );
+osl::DirectoryItem::get( m_pStream->GetFileName(), m_aItem );
LockList::get().push_back( this );
#if OSL_DEBUG_LEVEL > 1
+rtl::OString aFileName(rtl::OUStringToOString(m_pStream->GetFileName(),
+
osl_getThreadTextEncoding()));
fprintf( stderr, "locked %s", aFileName.getStr() );
if( m_
[Libreoffice-commits] .: toolkit/source
toolkit/source/awt/vclxprinter.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 877663b9c262be9b5d8620f756a4cfdf97195279 Author: Stephan Bergmann Date: Thu Jan 19 11:39:15 2012 +0100 Explicit type in SvStream::operator << call. diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 137c6f6..25a6efb 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -269,7 +269,7 @@ void VCLXPrinterPropertySet::selectForm( const ::rtl::OUString& rFormDescription ::osl::MutexGuard aGuard( Mutex ); SvMemoryStream aMem; -aMem << BINARYSETUPMARKER; +aMem << sal_uInt32(BINARYSETUPMARKER); aMem << GetPrinter()->GetJobSetup(); return ::com::sun::star::uno::Sequence( (sal_Int8*) aMem.GetData(), aMem.Tell() ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/extras/xdatapilotdescriptor.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c4e5e06ecca8c7f7f83e2e6e784157a3f2a93ef8
Author: Stephan Bergmann
Date: Thu Jan 19 11:26:08 2012 +0100
Undo inadvertent indentation change.
diff --git a/sc/qa/extras/xdatapilotdescriptor.cxx
b/sc/qa/extras/xdatapilotdescriptor.cxx
index e5151d5..e58c145 100644
--- a/sc/qa/extras/xdatapilotdescriptor.cxx
+++ b/sc/qa/extras/xdatapilotdescriptor.cxx
@@ -156,7 +156,7 @@ void ScXDataPilotDescriptor::testGetDataPilotFields_Impl(
uno::Reference< sheet:
case 0:
{
uno::Any aAny;
- aAny<<= sheet::DataPilotFieldOrientation_COLUMN;
+aAny<<= sheet::DataPilotFieldOrientation_COLUMN;
xPropSet->setPropertyValue(aOrientation, aAny);
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/qa
sc/qa/extras/xdatapilotdescriptor.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 16af33302b19fd90c5c24031e23a7c36e3b6b412
Author: Stephan Bergmann
Date: Thu Jan 19 11:21:57 2012 +0100
Fix C++03 enum member scope.
diff --git a/sc/qa/extras/xdatapilotdescriptor.cxx
b/sc/qa/extras/xdatapilotdescriptor.cxx
index 97612e8..e5151d5 100644
--- a/sc/qa/extras/xdatapilotdescriptor.cxx
+++ b/sc/qa/extras/xdatapilotdescriptor.cxx
@@ -156,35 +156,35 @@ void ScXDataPilotDescriptor::testGetDataPilotFields_Impl(
uno::Reference< sheet:
case 0:
{
uno::Any aAny;
-aAny<<=
sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_COLUMN;
+ aAny<<= sheet::DataPilotFieldOrientation_COLUMN;
xPropSet->setPropertyValue(aOrientation, aAny);
}
break;
case 1:
{
uno::Any aAny;
-aAny<<=
sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_ROW;
+aAny<<= sheet::DataPilotFieldOrientation_ROW;
xPropSet->setPropertyValue(aOrientation, aAny);
}
break;
case 2:
{
uno::Any aAny;
-aAny<<=
sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_DATA;
+aAny<<= sheet::DataPilotFieldOrientation_DATA;
xPropSet->setPropertyValue(aOrientation, aAny);
}
break;
case 3:
{
uno::Any aAny;
-aAny<<=
sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_HIDDEN;
+aAny<<= sheet::DataPilotFieldOrientation_HIDDEN;
xPropSet->setPropertyValue(aOrientation, aAny);
}
break;
case 4:
{
uno::Any aAny;
-aAny<<=
sheet::DataPilotFieldOrientation::DataPilotFieldOrientation_PAGE;
+aAny<<= sheet::DataPilotFieldOrientation_PAGE;
xPropSet->setPropertyValue(aOrientation, aAny);
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source vcl/inc vcl/source
connectivity/source/drivers/dbase/DTable.cxx |2 +- vcl/inc/vcl/graphictools.hxx |4 ++-- vcl/source/gdi/graphictools.cxx |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) New commits: commit c6b8c461bb4b119f833517112813def858903415 Author: Michael Meeks Date: Thu Jan 19 09:58:23 2012 + WaE: fix misc. SvStream operator problems. diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 40f1469..dde41d2 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -1311,7 +1311,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe (*m_pFileStream) << cTyp; if ( nDbaseType == VisualFoxPro ) -(*m_pFileStream) << (nRecLength-1); +(*m_pFileStream) << sal_uInt16(nRecLength-1); else m_pFileStream->Write(aBuffer, 4); diff --git a/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx index c027f6a..78be3b9 100644 --- a/vcl/inc/vcl/graphictools.hxx +++ b/vcl/inc/vcl/graphictools.hxx @@ -274,7 +274,7 @@ public: GradientTypeaGradientType, // TODO: Transparent gradients (orthogonal to normal ones) Color aGradient1stColor, // TODO: vector of colors and offsets Color aGradient2ndColor, -int aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. +sal_Int32 aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. const Graphic& aFillGraphic ); // accessors @@ -348,7 +348,7 @@ private: GradientTypemaGradientType; Color maGradient1stColor; Color maGradient2ndColor; -int maGradientStepCount; +sal_Int32 maGradientStepCount; Graphic maFillGraphic; }; diff --git a/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx index 3f6a0ec..d945e53 100644 --- a/vcl/source/gdi/graphictools.cxx +++ b/vcl/source/gdi/graphictools.cxx @@ -343,7 +343,7 @@ SvtGraphicFill::SvtGraphicFill( const PolyPolygon& rPath, GradientTypeaGradientType, Color aGradient1stColor, Color aGradient2ndColor, -int aGradientStepCount, +sal_Int32 aGradientStepCount, const Graphic& aFillGraphic ) : maPath( rPath ), maFillColor( aFillColor ), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: tools/source
tools/source/stream/stream.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 75a6a51a9da2aa3b6eb0f0e43c0130844f6ab86c
Author: Stephan Bergmann
Date: Thu Jan 19 10:56:28 2012 +0100
Fix int/sal_Int32 mismatch.
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index 6064a77..1ebbcb3 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -69,7 +69,7 @@ inline static void SwapLong( long& r )
{ r = SWAPLONG(r); }
inline static void SwapULong( sal_uInt32& r )
{ r = SWAPLONG(r); }
-inline static void SwapLongInt( int& r )
+inline static void SwapLongInt( sal_Int32& r )
{ r = SWAPLONG(r); }
inline static void SwapLongUInt( unsigned int& r )
{ r = SWAPLONG(r); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in
configure.in |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 6796128fbeea7b2cd71e99123bf86b56c23efd18 Author: Tor Lillqvist Date: Thu Jan 19 11:43:58 2012 +0200 Don't point to non-existent directories in JAVA_LIB diff --git a/configure.in b/configure.in index 50f895c..f9a889e 100644 --- a/configure.in +++ b/configure.in @@ -4989,7 +4989,10 @@ esac if test -n "$JAVA_ARCH" ; then JRE_BASE_DIR="$JAVA_HOME/jre/lib/$JAVA_ARCH" -JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/$JAVA_TOOLKIT -L $JRE_BASE_DIR/native_thread" +JAVALIB="-L $JAVA_HOME/$LIB64" +test -d "$JRE_BASE_DIR" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR" +test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR/$JAVA_TOOLKIT" +test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR/native_thread" fi AC_SUBST(x_JAVALIB) commit d199ce626d491d6c95e467bad60b4bb1c8b9f8c0 Author: Tor Lillqvist Date: Thu Jan 19 11:30:36 2012 +0200 Google calls armel just arm diff --git a/configure.in b/configure.in index 24d6652..50f895c 100644 --- a/configure.in +++ b/configure.in @@ -4927,7 +4927,7 @@ linux-androideabi*) case "$host_cpu" in -armel) +arm|armel) JAVA_ARCH="arm" JAVA_TOOLKIT="server" ;; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
