[Libreoffice-commits] .: binfilter/bf_basic binfilter/bf_forms binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw

2011-11-25 Thread David Tardon 
 binfilter/bf_basic/source/classes/image.cxx   |4 ++--
 binfilter/bf_basic/source/classes/sbxmod.cxx  |2 +-
 binfilter/bf_basic/source/comp/buffer.cxx |2 +-
 binfilter/bf_forms/source/component/forms_DatabaseForm.cxx|2 +-
 binfilter/bf_sc/source/core/data/sc_documen2.cxx  |2 +-
 binfilter/bf_sc/source/core/data/sc_documen9.cxx  |2 +-
 binfilter/bf_sc/source/core/data/sc_document.cxx  |2 +-
 binfilter/bf_sc/source/core/data/sc_global.cxx|6 +++---
 binfilter/bf_sc/source/core/tool/sc_autoform.cxx  |4 ++--
 binfilter/bf_sc/source/core/tool/sc_interpr1.cxx  |4 ++--
 binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx |2 +-
 binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx   |2 +-
 binfilter/bf_sc/source/ui/dbgui/sc_imoptdlg.cxx   |2 +-
 binfilter/bf_sch/source/core/sch_chtmode2.cxx |2 +-
 binfilter/bf_sch/source/core/sch_memchrt.cxx  |2 +-
 binfilter/bf_sd/source/core/sd_cusshow.cxx|8 
 binfilter/bf_sd/source/core/sd_drawdoc.cxx|8 
 binfilter/bf_sd/source/core/sd_sdpage.cxx |2 +-
 binfilter/bf_sd/source/core/sd_sdpage2.cxx|2 +-
 binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx  |2 +-
 binfilter/bf_so3/source/inplace/outplace.cxx  |2 +-
 binfilter/bf_so3/source/inplace/soconv.cxx|6 +++---
 binfilter/bf_so3/source/persist/persist.cxx   |4 ++--
 binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx |2 +-
 binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx |6 +++---
 binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx |4 ++--
 binfilter/bf_svtools/source/filter.vcl/wmf/svt_wmfwr.cxx  |4 ++--
 binfilter/bf_svtools/source/misc/svt_ctrltool.cxx |2 +-
 binfilter/bf_svtools/source/misc/svt_imap.cxx |2 +-
 binfilter/bf_svx/source/form/svx_fmpage.cxx   |2 +-
 binfilter/bf_svx/source/items/svx_numitem.cxx |2 +-
 binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx   |2 +-
 binfilter/bf_svx/source/svdraw/svx_svdouno.cxx|2 +-
 binfilter/bf_svx/source/svdraw/svx_svdview.cxx|2 +-
 binfilter/bf_svx/source/xoutdev/svx_xpool.cxx |4 ++--
 binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx   |6 +++---
 binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx  |4 ++--
 binfilter/bf_sw/source/core/swg/sw_rdcont.cxx |4 ++--
 binfilter/bf_sw/source/core/swg/sw_rdmisc.cxx |2 +-
 binfilter/bf_sw/source/core/swg/sw_rdswg.cxx  |2 +-
 binfilter/bf_sw/source/filter/excel/sw_exlpar.cxx |2 +-
 binfilter/bf_sw/source/filter/sw6/sw_sw6file.cxx  |2 +-
 binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx   |2 +-
 binfilter/bf_sw/source/ui/app/sw_docsh.cxx|2 +-
 binfilter/bf_sw/source/ui/app/sw_docshini.cxx |4 ++--
 binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx   |2 +-
 binfilter/inc/bf_svtools/ownlist.hxx  |8 
 binfilter/inc/bf_sw/shellio.hxx   |2 +-
 48 files changed, 75 insertions(+), 75 deletions(-)

New commits:
commit 2fcbe65d37c7cdee6ff504810106e50e0e0026ee
Author: David Tardon 
Date:   Thu Nov 24 12:07:14 2011 +0100

gsl_getSystemTextEncoding -> osl_getThreadTextEncoding

diff --git a/binfilter/bf_basic/source/classes/image.cxx 
b/binfilter/bf_basic/source/classes/image.cxx
index 88600c4..c41c51a 100644
--- a/binfilter/bf_basic/source/classes/image.cxx
+++ b/binfilter/bf_basic/source/classes/image.cxx
@@ -51,7 +51,7 @@ SbiImage::SbiImage()
 bInit  =
 bError = FALSE;
 bFirstInit = TRUE;
-eCharSet   = gsl_getSystemTextEncoding();
+eCharSet   = osl_getThreadTextEncoding();
 }
 
 SbiImage::~SbiImage()
@@ -73,7 +73,7 @@ void SbiImage::Clear()
 nStringSize= 0;
 nLegacyCodeSize  = 0;
 nCodeSize  = 0;
-eCharSet   = gsl_getSystemTextEncoding();
+eCharSet   = osl_getThreadTextEncoding();
 nDimBase   = 0;
 bError = FALSE;
 }
diff --git a/binfilter/bf_basic/source/classes/sbxmod.cxx 
b/binfilter/bf_basic/source/classes/sbxmod.cxx
index c38bf2c..e664330 100644
--- a/binfilter/bf_basic/source/classes/sbxmod.cxx
+++ b/binfilter/bf_basic/source/classes/sbxmod.cxx
@@ -608,7 +608,7 @@ BOOL SbJScriptModule::LoadData( SvStream& rStrm, USHORT 
nVer )
 
 // Source-String holen
 String aTmp;
-rStrm.ReadByteString( aTmp, gsl_getSystemTextEncoding() );
+rStrm.ReadByteString( aTmp, osl_getThreadTextEncod

[Libreoffice-commits] .: sc/qa

2011-11-25 Thread François Tigeot 
 sc/qa/unit/filters-test.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit eda3e5dcb63e6bce71df2c1c941eacd7f0c79191
Author: François Tigeot 
Date:   Fri Nov 25 09:41:25 2011 +0100

Disable password test on DragonFly

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 587b71e..7fb1d5e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -200,7 +200,8 @@ public:
 CPPUNIT_TEST(testBugFixesXLS);
 CPPUNIT_TEST(testBugFixesXLSX);
 //disable testPassword on MacOSX due to problems with libsqlite3
-#if !defined(MACOSX)
+//also crashes on DragonFly due to problems with nss/nspr headers
+#if !defined(MACOSX) && !defined(DRAGONFLY)
 CPPUNIT_TEST(testPassword);
 #endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/inc

2011-11-25 Thread Lubos Lunak 
 oox/inc/oox/mathml/importutils.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f87ea359f45a8d8edbf029a5268b40fab3d1fa6c
Author: Luboš Luňák 
Date:   Thu Nov 24 20:54:37 2011 +0100

fix compile

diff --git a/oox/inc/oox/mathml/importutils.hxx 
b/oox/inc/oox/mathml/importutils.hxx
index d5d2540..ad6ad6b 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
@@ -29,8 +29,8 @@
 #define _STARMATHIMPORTUTILS_HXX
 
 #include 
+#include 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - setup_native/source

2011-11-25 Thread Andras Timar 
 
setup_native/source/win32/customactions/languagepacks/checkrunningofficelanguagepack.cxx
 |3 
 setup_native/source/win32/customactions/patch/swappatchfiles.cxx   
  |3 
 setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx 
  |  142 +-
 3 files changed, 26 insertions(+), 122 deletions(-)

New commits:
commit c392dfe4ff4273e63f62c8642c7532e7c7bddc37
Author: Andras Timar 
Date:   Fri Nov 25 09:44:14 2011 +0100

change logic of IsOfficeRunning custom action fdo#36677

instead of trying to rename a file or folder in
Program Files directory - which is write protected
anyway normally - installer checks the process list,
if there is a process called "soffice.bin".

diff --git 
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
 
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 38f5bcd..fce807f 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,6 +53,10 @@
 #include 
 #include 
 
+// works with Windows XP as well as with Windows 7
+#define PSAPI_VERSION 1
+#include 
+
 #include 
 #include <../tools/seterror.hxx>
 
@@ -90,133 +94,42 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, 
const std::_tstring& sPro
 return  result;
 }
 
-static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& 
sProperty)
-{
-std::_tstring value = GetMsiProperty(handle, sProperty);
-return (value.length() > 0);
-}
-
-static inline void UnsetMsiProperty(MSIHANDLE handle, const std::_tstring& 
sProperty)
-{
-MsiSetProperty(handle, sProperty.c_str(), NULL);
-}
-
-static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& 
sProperty)
-{
-MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
-}
-
 extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-OSVERSIONINFO   osverinfo;
-osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-GetVersionEx( &osverinfo );
-
-// renaming the vcl resource doesn't work reliable with OS >= Windows Vista
-if (osverinfo.dwMajorVersion < 6 )
-{
-std::_tstring sInstDir = GetMsiProperty( handle, 
TEXT("INSTALLLOCATION") );
-// Property empty -> no office installed
-if ( sInstDir.length() == 0 )
-return ERROR_SUCCESS;
+std::_tstring sOfficeInstallPath = GetMsiProperty(handle, 
TEXT("INSTALLLOCATION"));
+// Property empty -> no office installed
+if ( sOfficeInstallPath.length() == 0 )
+return ERROR_SUCCESS;
 
-std::_tstring sResourceDir = sInstDir + 
TEXT("Basis\\program\\resource\\");
-std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
+DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to 
be enough for anybody */
 
-//std::_tstring mystr;
-//mystr = "IsOfficeRunning start. Checking file in dir: " + 
sResourceDir;
-//MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
+if ( !EnumProcesses( aProcesses, sizeof(aProcesses), &cbNeeded ) )
+return ERROR_INSTALL_FAILURE;
 
-WIN32_FIND_DATA aFindFileData;
-HANDLE  hFind = FindFirstFile( sPattern.c_str(), &aFindFileData );
+cProcesses = cbNeeded / sizeof(DWORD);
 
-if ( IsValidHandle(hFind) )
+// Check if there is "soffice.bin" among the processes
+for ( unsigned int i = 0; i < cProcesses; i++ )
+{
+if( aProcesses[i] != 0 )
 {
-BOOLfSuccess = false;
-boolfRenameSucceeded;
-
-do
+TCHAR szProcessName[MAX_PATH] = TEXT("");
+HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | 
PROCESS_VM_READ, FALSE,  aProcesses[i] );
+if (NULL != hProcess )
 {
-std::_tstring   sResourceFile = sResourceDir + 
aFindFileData.cFileName;
-std::_tstring   sIntermediate = sResourceFile + TEXT(".tmp");
-
-fRenameSucceeded = MoveFileExA( sResourceFile.c_str(), 
sIntermediate.c_str(), MOVEFILE_REPLACE_EXISTING );
-if ( fRenameSucceeded )
-{
-MoveFileExA( sIntermediate.c_str(), sResourceFile.c_str(), 
0 );
-fSuccess = FindNextFile( hFind, &aFindFileData );
-}
-} while ( fSuccess && fRenameSucceeded );
-
-if ( !fRenameSucceeded )
-{
-MsiSetProperty(handle, TEXT("OFFICERUNS"), TEXT("1"));
-SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING );
-
-//mystr = "Office is running";
-//MessageBox( NULL, mystr.c_str(), "IsOfficeRunning", MB_OK );
+HMODULE hMod;
+if ( EnumProcessModules( hProcess, &hMod, sizeof(hMod), 
&cbNeeded) )
+GetModuleBaseName(

[Libreoffice-commits] .: unusedcode.easy

2011-11-25 Thread Caolán McNamara 
 unusedcode.easy |   20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 997da2415f7bf5bdaac9a69672e9fc46914c06e3
Author: Caolán McNamara 
Date:   Fri Nov 25 08:50:20 2011 +

update list

diff --git a/unusedcode.easy b/unusedcode.easy
index 98cc325..af938e0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -4,6 +4,7 @@ AtomDocument::AtomDocument(AtomPubSession*, 
std::basic_string, std::allocator >)
 AtomPubSession::getCollectionUrl(Collection::Type)
 AtomPubSession::~AtomPubSession()
+BitmapWriteAccess::DrawPolygon(Polygon const&)
 BufferNode::childAt(int) const
 ByteString::Assign(char const*, unsigned short)
 ByteString::Assign(char)
@@ -535,7 +536,6 @@ SfxShell::RemoveItem(unsigned short)
 SfxSlotPool::NextInterface()
 SfxStyleSheet::SfxStyleSheet()
 SfxTabDialog::GetApplyHandler() const
-SfxTabPage::SfxTabPage(Window*, long, SfxItemSet const&)
 SfxThesSubMenuControl::RegisterControl(unsigned short, SfxModule*)
 SfxToDoStack_Implarr_::Contains(SfxToDo_Impl const&) const
 SfxToDoStack_Implarr_::Insert(unsigned short, SfxToDo_Impl const&, unsigned 
short)
@@ -885,6 +885,7 @@ SvxUnoTextBase::InsertField(SvxFieldItem const&)
 SvxUnoTextBase::SvxUnoTextBase(SvxEditSource const*, SvxItemPropertySet const*)
 SvxUnoTextContent::SvxUnoTextContent()
 SvxZoomStatusBarControl::GetDefItemWidth(StatusBar const&)
+SwAttrIter::Dump(SvStream&) const
 SwBlinkList::Insert(SwBlinkList const*, unsigned short, unsigned short)
 SwBlinkList::Insert(SwBlinkPortion* const&, unsigned short&)
 SwBlinkList::Insert(SwBlinkPortion* const*, unsigned short)
@@ -939,6 +940,7 @@ SwLRects::Insert(SwLRects const*, unsigned short, unsigned 
short, unsigned short
 SwLRects::Replace(SwLineRect const&, unsigned short)
 SwLRects::Replace(SwLineRect const*, unsigned short, unsigned short)
 SwLRects::_ForEach(unsigned short, unsigned short, unsigned char 
(*)(SwLineRect const&, void*), void*)
+SwLineLayout::DebugPortions(SvStream&, String const&, unsigned short)
 SwMailMergeChildWindow::GetChildWindowId()
 SwModify::GetClientCount() const
 SwOutlineNodes::Insert(SwNode* const&, unsigned short&)
@@ -952,6 +954,8 @@ SwPosFlyFrms::Insert(SwPosFlyFrm* const*, unsigned short)
 SwPosFlyFrms::Insert(SwPosFlyFrms const*, unsigned short, unsigned short)
 SwPosFlyFrms::Remove(SwPosFlyFrm* const&, unsigned short)
 SwPosFlyFrms::Remove(unsigned short, unsigned short)
+SwProtocol::GetVar(unsigned short, long&)
+SwProtocol::SnapShot(SwFrm const*, unsigned long)
 SwRects::Replace(SwRect const&, unsigned short)
 SwRects::Replace(SwRect const*, unsigned short, unsigned short)
 SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(SwRect 
const&, void*), void*)
@@ -983,6 +987,17 @@ SwTabFrm::GetLeaf(MakePageType, unsigned char)
 SwTableSortBoxes::DeleteAndDestroy(unsigned short, unsigned short)
 SwTableSortBoxes::Insert(SwTableBox* const&, unsigned short&)
 SwTableSortBoxes::Insert(SwTableBox* const*, unsigned short)
+SwTxtFly::ShowContour(OutputDevice*)
+SwTxtSizeInfo::IsOptCalm() const
+SwTxtSizeInfo::IsOptLow() const
+SwTxtSizeInfo::IsOptTest1() const
+SwTxtSizeInfo::IsOptTest2() const
+SwTxtSizeInfo::IsOptTest3() const
+SwTxtSizeInfo::IsOptTest4() const
+SwTxtSizeInfo::IsOptTest5() const
+SwTxtSizeInfo::IsOptTest6() const
+SwTxtSizeInfo::IsOptTest7() const
+SwTxtSizeInfo::IsOptTest8() const
 SwVbaColumn::calculateAbsoluteColumnWidth(int, 
com::sun::star::uno::Sequence 
const&, double*)
 SwVbaColumn::calculateRelativeColumnWidth(double const*, double*, int)
 SwVbaStyle::getOOoStyleTypeFromMSWord(int)
@@ -1039,6 +1054,7 @@ TaskStatusFieldItem::TaskStatusFieldItem()
 TempFile::IsValid() const
 TextObj::TextObj(TextObj&)
 TextObj::Write(SvStream*)
+ToolBox::GetToolbarLayoutMode()
 TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor 
const&, com::sun::star::uno::Reference&)
 UCBStorage::IsStorageFile(String const&)
 
UCBStream::UCBStream(com::sun::star::uno::Reference&)
@@ -2020,6 +2036,7 @@ 
oox::dump::TextStreamObjectBase::construct(oox::dump::InputObjectBase const&, un
 oox::dump::XmlStreamObject::XmlStreamObject(oox::dump::OutputObjectBase 
const&, oox::dump::BinaryInputStreamRef const&)
 oox::dump::biff::BiffObjectBase::dumpRowRange(oox::dump::String const&, bool)
 oox::dump::biff::FormulaObject::dumpCellFormula(oox::dump::String const&, 
unsigned short)
+oox::formulaimport::XmlStream::AttributeList::hasAttribute(int) const
 oox::ole::VbaHelper::getBasicScriptUrl(rtl::OUString const&, rtl::OUString 
const&, rtl::OUString const&)
 oox::ole::VbaProject::hasDialog(rtl::OUString const&) const
 oox::ole::VbaProject::hasModule(rtl::OUString const&) const
@@ -2230,6 +2247,7 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* 
const&, unsigned short&)
 svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short)
 svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray 
const*, unsigned short, unsigned short)
 svxform::SvLBoxEntrySortedArr

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - setup_native/source

2011-11-25 Thread Fridrich Strba 
 setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx 
|  205 +-
 setup_native/source/win32/customactions/shellextensions/makefile.mk
|3 
 2 files changed, 27 insertions(+), 181 deletions(-)

New commits:
commit 2408d229104c3e198ce79e72bb89ce360575aa36
Author: Andras Timar 
Date:   Thu Nov 24 23:10:30 2011 +0100

change logic of IsOfficeRunning custom action fdo#36677

instead of trying to rename a file or folder in
Program Files directory - which is write protected
anyway normally - installer checks the process list,
if there is a process called "soffice.bin".

Signed-off-by: Fridrich Å trba 

diff --git 
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
 
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 0cf8458..3432ddd 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -53,6 +53,10 @@
 #include 
 #include 
 
+// works with Windows XP as well as with Windows 7
+#define PSAPI_VERSION 1
+#include 
+
 #include 
 #include <../tools/seterror.hxx>
 
@@ -93,201 +97,42 @@ static std::_tstring GetMsiProperty( MSIHANDLE handle, 
const std::_tstring& sPro
 return result;
 }
 
-static inline bool IsSetMsiProperty(MSIHANDLE handle, const std::_tstring& 
sProperty)
-{   
-std::_tstring value = GetMsiProperty(handle, sProperty);
-return (value.length() > 0);
-}
-
-static inline void UnsetMsiProperty(MSIHANDLE handle, const std::_tstring& 
sProperty)
+extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
 {
-MsiSetProperty(handle, sProperty.c_str(), NULL);
-}
+std::_tstring sOfficeInstallPath = GetMsiProperty(handle, 
TEXT("INSTALLLOCATION"));
+// Property empty -> no office installed
+if ( sOfficeInstallPath.length() == 0 )
+return ERROR_SUCCESS;
 
-static inline void SetMsiProperty(MSIHANDLE handle, const std::_tstring& 
sProperty)
-{
-MsiSetProperty(handle, sProperty.c_str(), TEXT("1"));
-}
+DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to 
be enough for anybody */
 
-static BOOL MoveFileEx9x( LPCSTR lpExistingFileNameA, LPCSTR lpNewFileNameA, 
DWORD dwFlags )
-{
-BOOL   fSuccess = FALSE;   // assume failure
+if ( !EnumProcesses( aProcesses, sizeof(aProcesses), &cbNeeded ) )
+return ERROR_INSTALL_FAILURE;
 
-// Windows 9x has a special mechanism to move files after reboot
+cProcesses = cbNeeded / sizeof(DWORD);
 
-if ( dwFlags & MOVEFILE_DELAY_UNTIL_REBOOT )
+// Check if there is "soffice.bin" among the processes
+for ( unsigned int i = 0; i < cProcesses; i++ )
 {
-CHAR   szExistingFileNameA[MAX_PATH];
-CHAR   szNewFileNameA[MAX_PATH] = "NUL";
-
-// Path names in WININIT.INI must be in short path name form
-
-if ( 
-GetShortPathNameA( lpExistingFileNameA, szExistingFileNameA, 
MAX_PATH ) &&
-(!lpNewFileNameA || GetShortPathNameA( lpNewFileNameA, 
szNewFileNameA, MAX_PATH ))
-)
+if( aProcesses[i] != 0 )
 {
-CHAR   szBuffer[32767];// The buffer size must not 
exceed 32K
-DWORD  dwBufLen = GetPrivateProfileSectionA( RENAME_SECTION, 
szBuffer, SAL_N_ELEMENTS(szBuffer), WININIT_FILENAME );
-
-CHAR   szRename[MAX_PATH]; // This is enough for at most 
to times 67 chracters
-strcpy( szRename, szNewFileNameA );
-strcat( szRename, "=" );
-strcat( szRename, szExistingFileNameA );
-size_t lnRename = strlen(szRename);
-
-if ( dwBufLen + lnRename + 2 <= SAL_N_ELEMENTS(szBuffer) )
+TCHAR szProcessName[MAX_PATH] = TEXT("");
+HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | 
PROCESS_VM_READ, FALSE,  aProcesses[i] );
+if (NULL != hProcess )
 {
-CopyMemory( &szBuffer[dwBufLen], szRename, lnRename );
-szBuffer[dwBufLen + lnRename ] = 0;
-szBuffer[dwBufLen + lnRename + 1 ] = 0;
-
-fSuccess = WritePrivateProfileSectionA( RENAME_SECTION, 
szBuffer, WININIT_FILENAME );
+HMODULE hMod;
+if ( EnumProcessModules( hProcess, &hMod, sizeof(hMod), 
&cbNeeded) )
+GetModuleBaseName( hProcess, hMod, szProcessName, 
sizeof(szProcessName)/sizeof(TCHAR) );
 }
-else
-SetLastError( ERROR_BUFFER_OVERFLOW );
-}
-}
-else
-{
-
-fSuccess = MoveFileA( lpExistingFileNameA, lpNewFileNameA );
-
-if ( !fSuccess && GetLastError() != ERROR_ACCESS_DENIED &&
-0 != (dwFlags & (MOVEFILE_COPY_ALLOWED | 
MOVEFILE_REPLACE_EXISTING)) )
-{
-BOOL   bFailIfExist = 0 == (dwFlags & 
MOVEFI

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

2011-11-25 Thread Fridrich Strba 
 scp2/source/ooo/common_brand.scp |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5a5fd169cb471192cc9d1602b1bd88107af9280b
Author: Andras Timar 
Date:   Wed Nov 23 13:40:17 2011 +0100

create this dir so uninstall can remove it

Signed-off-by: Fridrich Å trba 

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2557f0d..19f560f 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -413,6 +413,12 @@ Directory gid_Brand_Dir_Share_Uno_Packages_Cache
 Styles = (CREATE);
 End
 
+Directory gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
+ParentID = gid_Brand_Dir_Share_Uno_Packages_Cache;
+DosName = "uno_packages";
+Styles = (CREATE);
+End
+
 Directory gid_Brand_Dir_Share_Registry
 ParentID = gid_Brand_Dir_Share;
 DosName = "registry";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: writerfilter/source

2011-11-25 Thread Cédric Bosdonnat 
 writerfilter/source/rtftok/rtfcontrolwords.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 52e6bfeb324574f2330d191c208860ddc2d532e0
Author: Cédric Bosdonnat 
Date:   Fri Nov 25 10:02:02 2011 +0100

RTF import: fixed the missing paragraph breaks from fdo#43206.

"\\\n" is used as an equivalent to \par even though I couldn't find it
in the specs.

diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx 
b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 3b82e80..3dd2672 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -38,6 +38,7 @@ RTFSymbol aRTFControlWords[] = {
 {"*", CONTROL_SYMBOL, RTF_IGNORE},
 {":", CONTROL_SYMBOL, RTF_SUBENTRY},
 {"\\", CONTROL_SYMBOL, RTF_BACKSLASH},
+{"\n", CONTROL_SYMBOL, RTF_PAR},
 {"_", CONTROL_SYMBOL, RTF_NOBRKHYPH},
 {"{", CONTROL_SYMBOL, RTF_LBRACE},
 {"|", CONTROL_SYMBOL, RTF_FORMULA},
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/Package_inc.mk

2011-11-25 Thread Stephan Bergmann 
 oox/Package_inc.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 59210463cce786edafeb09edfdaf147b7278b289
Author: Stephan Bergmann 
Date:   Fri Nov 25 09:12:52 2011 +0100

no need to export oox/helper/attributelist.hxx any longer

diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index 5564eab..ac2ad7d 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -41,7 +41,6 @@ $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/export/drawingml.hxx,oox/expor
 $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/export/shapes.hxx,oox/export/shapes.hxx))
 $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/export/utils.hxx,oox/export/utils.hxx))
 $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/export/vmlexport.hxx,oox/export/vmlexport.hxx))
-$(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/helper/attributelist.hxx,oox/helper/attributelist.hxx))
 $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/helper/binarystreambase.hxx,oox/helper/binarystreambase.hxx))
 $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/helper/containerhelper.hxx,oox/helper/containerhelper.hxx))
 $(eval $(call 
gb_Package_add_file,oox_inc,inc/oox/helper/graphichelper.hxx,oox/helper/graphichelper.hxx))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/inc

2011-11-25 Thread Stephan Bergmann 
 tools/inc/tools/debug.hxx |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 360043b30ebe21a6a02b5cdfe0b4bd12ab22
Author: Stephan Bergmann 
Date:   Fri Nov 25 10:51:13 2011 +0100

demoted plentiful DBG_WARNING etc. to SAL_INFO

diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index ecbfa3b..4fde7b5 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.hxx
@@ -46,7 +46,7 @@
 have been used for true assertions as well as for logged warnings, they map
 to SAL_WARN instead of standard assert.  The warning and error macros
 (DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING5, DBG_WARNINGFILE,
-DBG_ERRORFILE) all map to SAL_WARN, too.
+DBG_ERRORFILE) all map to SAL_INFO.
 */
 
 // 
@@ -480,23 +480,23 @@ public:
 #endif
 
 #define DBG_WARNING( aWarning ) \
-SAL_DETAIL_WARN_IF_FORMAT(true, "legacy.tools", aWarning)
+SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning)
 #define DBG_WARNING1( aWarning, x1 ) \
-SAL_DETAIL_WARN_IF_FORMAT(true, "legacy.tools", aWarning, x1)
+SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1)
 #define DBG_WARNING2( aWarning, x1, x2 ) \
-SAL_DETAIL_WARN_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2)
+SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2)
 #define DBG_WARNING3( aWarning, x1, x2, x3 ) \
-SAL_DETAIL_WARN_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2, x3)
+SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2, x3)
 #define DBG_WARNING4( aWarning, x1, x2, x3, x4 ) \
-SAL_DETAIL_WARN_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2, x3, x4)
+SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aWarning, x1, x2, x3, x4)
 #define DBG_WARNING5( aWarning, x1, x2, x3, x4, x5 ) \
-SAL_DETAIL_WARN_IF_FORMAT( \
+SAL_DETAIL_INFO_IF_FORMAT( \
 true, "legacy.tools", aWarning, x1, x2, x3, x4, x5)
-#define DBG_WARNINGFILE( aWarning ) SAL_DETAIL_WARN_IF_FORMAT( \
+#define DBG_WARNINGFILE( aWarning ) SAL_DETAIL_INFO_IF_FORMAT( \
 true, "legacy.tools", aWarning, __FILE__, __LINE__)
 
 #define DBG_ERRORFILE( aError ) \
-SAL_DETAIL_WARN_IF_FORMAT(true, "legacy.tools", aError, __FILE__, __LINE__)
+SAL_DETAIL_INFO_IF_FORMAT(true, "legacy.tools", aError, __FILE__, __LINE__)
 
 #define DBG_TESTSOLARMUTEX()\
 do  \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: tools/bootstrp tools/inc tools/source

2011-11-25 Thread Caolán McNamara 
 tools/bootstrp/prj.cxx |   28 +-
 tools/inc/bootstrp/prj.hxx |2 
 tools/source/fsys/wldcrd.cxx   |   12 ++--
 tools/source/inet/inetmime.cxx |  106 -
 4 files changed, 63 insertions(+), 85 deletions(-)

New commits:
commit 6312367fb80f0cce15c576981b342ed57baf2b95
Author: Caolán McNamara 
Date:   Fri Nov 25 09:20:04 2011 +

ByteString->rtl::OString

diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index a3caf23..ef362a0 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.cxx
@@ -28,21 +28,8 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_tools.hxx"
-#include 
-#include 
-#include 
-
-#include 
-#include 
 #include "bootstrp/prj.hxx"
-
-#if defined(WNT)
-#define LIST_DELIMETER ';'
-#define PATH_DELIMETER '\\'
-#elif defined UNX
-#define LIST_DELIMETER ':'
-#define PATH_DELIMETER '/'
-#endif
+#include 
 
 SimpleConfig::SimpleConfig(const String &rSimpleConfigFileName)
 {
@@ -56,21 +43,14 @@ SimpleConfig::~SimpleConfig()
 
 rtl::OString SimpleConfig::getNext()
 {
-if (aStringBuffer == "")
+if (aStringBuffer.isEmpty())
   while ((aStringBuffer = GetNextLine()) == "\t") ; //solange bis != "\t"
-if ( aStringBuffer == "" )
+if (aStringBuffer.isEmpty())
 return rtl::OString();
 
 rtl::OString aString = comphelper::string::getToken(aStringBuffer, 0, 
'\t');
 
-#ifdef _MSC_VER
-#pragma warning (push)
-#pragma warning (disable:4244)
-#endif
-aStringBuffer.Erase(0, aString.getLength()+1);
-#ifdef _MSC_VER
-#pragma warning (pop)
-#endif
+aStringBuffer = aStringBuffer.copy(aString.getLength()+1);
 
 aStringBuffer = comphelper::string::stripStart(aStringBuffer, '\t');
 
diff --git a/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index 62d9727..f416053 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.hxx
@@ -43,7 +43,7 @@
 class SimpleConfig
 {
 SvFileStream aFileStream;
-ByteString aStringBuffer;
+rtl::OString aStringBuffer;
 
 rtl::OString GetNextLine();
 public:
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 9071924..c1acd61 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.cxx
@@ -112,24 +112,24 @@ sal_uInt16 WildCard::ImpMatch( const char *pWild, const 
char *pStr ) const
 
 sal_Bool WildCard::Matches( const String& rString ) const
 {
-ByteString aTmpWild = aWildString;
+rtl::OString aTmpWild = aWildString;
 rtl::OString aString(rtl::OUStringToOString(rString, 
osl_getThreadTextEncoding()));
 
-sal_uInt16  nSepPos;
+sal_Int32 nSepPos;
 
 if ( cSepSymbol != '\0' )
 {
-while ( (nSepPos = aTmpWild.Search( cSepSymbol )) != STRING_NOTFOUND )
+while ( (nSepPos = aTmpWild.indexOf(cSepSymbol)) != -1 )
 {
 // alle getrennten WildCard's pruefen
-if ( ImpMatch( aTmpWild.Copy( 0, nSepPos ).GetBuffer(), 
aString.getStr() ) )
+if ( ImpMatch( aTmpWild.copy( 0, nSepPos ).getStr(), 
aString.getStr() ) )
 return sal_True;
-aTmpWild.Erase( 0, nSepPos + 1 ); // Trennsymbol entfernen
+aTmpWild = aTmpWild.copy(nSepPos + 1); // Trennsymbol entfernen
 }
 // und noch den hinter dem letzen Trennsymbol bzw. den einzigen
 }
 
-if ( ImpMatch( aTmpWild.GetBuffer(), aString.getStr() ) )
+if ( ImpMatch( aTmpWild.getStr(), aString.getStr() ) )
 return sal_True;
 else
 return sal_False;
diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index e6b8db1..6034f3b 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.cxx
@@ -117,25 +117,25 @@ namespace unnamed_tools_inetmime {
 struct Parameter
 {
 Parameter * m_pNext;
-ByteString m_aAttribute;
-ByteString m_aCharset;
-ByteString m_aLanguage;
-ByteString m_aValue;
+rtl::OString m_aAttribute;
+rtl::OString m_aCharset;
+rtl::OString m_aLanguage;
+rtl::OString m_aValue;
 sal_uInt32 m_nSection;
 bool m_bExtended;
 
-inline Parameter(Parameter * pTheNext, ByteString const & rTheAttribute,
- ByteString const & rTheCharset,
- ByteString const & rTheLanguage,
- ByteString const & rTheValue, sal_uInt32 nTheSection,
+inline Parameter(Parameter * pTheNext, const rtl::OString& rTheAttribute,
+ const rtl::OString& rTheCharset,
+ const rtl::OString& rTheLanguage,
+ const rtl::OString& rTheValue, sal_uInt32 nTheSection,
  bool bTheExtended);
 };
 
 inline Parameter::Parameter(Parameter * pTheNext,
-ByteString const & rTheAttribute,
-ByteString const & rTheCharset,
-ByteString const & rTheLanguage,
-ByteString const &

[Libreoffice-commits] .: jvmfwk/distributions

2011-11-25 Thread Stephan Bergmann 
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |4 
 1 file changed, 4 insertions(+)

New commits:
commit f95052c29b076995a54b1d3f7c0becf35ebcd23f
Author: Stephan Bergmann 
Date:   Fri Nov 25 11:01:18 2011 +0100

duplicate "add Oracle Java 1.7.0 recognition" from javavendors_linux -> wnt

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index a72216d..5c92b7a 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -9,6 +9,9 @@
   
 1.5.0
   
+  
+1.7.0
+  
   
 1.5.0
   
@@ -16,6 +19,7 @@
 
  
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
   vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dll
  
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

2011-11-25 Thread Cédric Bosdonnat 
 oox/source/helper/graphichelper.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 65be3e7908f21355fc8cc443192338d1cc8a8d61
Author: Cédric Bosdonnat 
Date:   Fri Nov 25 11:16:29 2011 +0100

Docx crasher: there may be no External Header for pictures.

diff --git a/oox/source/helper/graphichelper.cxx 
b/oox/source/helper/graphichelper.cxx
index fd3046e..6ddb986 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -257,7 +257,7 @@ Reference< XGraphic > GraphicHelper::importGraphic( const 
Reference< XInputStrea
 aArgs[ 0 ].Name = CREATE_OUSTRING( "InputStream" );
 aArgs[ 0 ].Value <<= rxInStrm;
 
-if ( pExtHeader->mapMode > 0 )
+if ( pExtHeader && pExtHeader->mapMode > 0 )
 {
 aArgs.realloc( aArgs.getLength() + 1 );
 Sequence< PropertyValue > aFilterData( 3 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: automation/source basctl/source basic/inc basic/source UnoControls/source

2011-11-25 Thread Michael Meeks 
 UnoControls/source/base/basecontainercontrol.cxx |4 ++--
 automation/source/simplecm/simplecm.cxx  |   14 +++---
 automation/source/testtool/cmdstrm.cxx   |4 ++--
 basctl/source/basicide/basidesh.cxx  |3 +--
 basctl/source/basicide/tbxctl.cxx|4 ++--
 basctl/source/inc/svheader.hxx   |2 +-
 basic/inc/basic/testtool.hxx |2 +-
 basic/source/app/textedit.cxx|4 ++--
 basic/source/classes/sbunoobj.cxx|2 +-
 basic/source/comp/symtbl.cxx |2 +-
 basic/source/runtime/props.cxx   |2 +-
 11 files changed, 21 insertions(+), 22 deletions(-)

New commits:
commit 5c76e221fec40db02d2c6de5204e0d43dc5420fd
Author: mikew 
Date:   Thu Nov 24 23:56:22 2011 -0800

Some German to English comment translations.

diff --git a/UnoControls/source/base/basecontainercontrol.cxx 
b/UnoControls/source/base/basecontainercontrol.cxx
index 469146b..af1d349 100644
--- a/UnoControls/source/base/basecontainercontrol.cxx
+++ b/UnoControls/source/base/basecontainercontrol.cxx
@@ -208,8 +208,8 @@ Reference< XControlModel > SAL_CALL 
BaseContainerControl::getModel() throw( Runt
 
 void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException )
 {
-// Zuerst der Welt mitteilen, da� der Container wegfliegt. Dieses ist um 
einiges
-// schneller wenn die Welt sowohl an den Controls als auch am Container 
horcht
+// Tell everything that this container is now gone.
+// It's faster if you listen to both the control and the container.
 
 // Ready for multithreading
 MutexGuard aGuard( m_aMutex );
diff --git a/automation/source/simplecm/simplecm.cxx 
b/automation/source/simplecm/simplecm.cxx
index b5087f2..ba9b799 100644
--- a/automation/source/simplecm/simplecm.cxx
+++ b/automation/source/simplecm/simplecm.cxx
@@ -376,7 +376,7 @@ ByteString CommunicationManager::GetMyName( CM_NameType )
 
 void CommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 {
-pCL->StartCallback();   // Sollte bereits vor dem Aufruf gerufen werden
+pCL->StartCallback();   // This should already have been called.
 pCL->aStart = DateTime();
 pCL->aLastAccess = pCL->aStart;
 bIsCommunicationRunning = sal_True;
@@ -385,7 +385,7 @@ void CommunicationManager::CallConnectionOpened( 
CommunicationLink* pCL )
 xLastNewLink = pCL;
 
 INFO_MSG( CByteString("C+:").Append( pCL->GetCommunicationPartner( CM_FQDN 
) ),
-CByteString("Verbindung aufgebaut: ").Append( 
pCL->GetCommunicationPartner( CM_FQDN ) ),
+CByteString("Connection established: ").Append( 
pCL->GetCommunicationPartner( CM_FQDN ) ),
 CM_OPEN, pCL );
 ConnectionOpened( pCL );
 pCL->FinishCallback();
@@ -393,11 +393,11 @@ void CommunicationManager::CallConnectionOpened( 
CommunicationLink* pCL )
 
 void CommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
 {
-pCL->StartCallback();   // Sollte bereits vor dem Aufruf gerufen werden
+pCL->StartCallback();   // This should already have been called.
 pCL->aLastAccess = DateTime();
 
 INFO_MSG( CByteString("C-:").Append( pCL->GetCommunicationPartner( CM_FQDN 
) ),
-CByteString("Verbindung abgebrochen: ").Append( 
pCL->GetCommunicationPartner( CM_FQDN ) ),
+CByteString("Connection broken: ").Append( 
pCL->GetCommunicationPartner( CM_FQDN ) ),
 CM_CLOSE, pCL );
 ConnectionClosed( pCL );
 
@@ -410,9 +410,9 @@ void CommunicationManager::CallConnectionClosed( 
CommunicationLink* pCL )
 
 void CommunicationManager::CallDataReceived( CommunicationLink* pCL )
 {
-pCL->StartCallback();   // Sollte bereits vor dem Aufruf gerufen werden
+pCL->StartCallback();   // Should have already been called
 pCL->aLastAccess = DateTime();
-CommunicationLinkRef rHold(pCL);// H�lt den Zeiger bis zum Ende des 
calls
+CommunicationLinkRef rHold(pCL);// Keep the pointer for a bit.
 
 // should be impossible but happens for mysterious reasons
 if ( !pCL->pServiceData )
@@ -494,7 +494,7 @@ void CommunicationManager::CallDataReceived( 
CommunicationLink* pCL )
 
 void CommunicationManager::CallInfoMsg( InfoString aMsg )
 {
-// Hier wird es wohl kein Housekeeping geben
+// Probably no housekeeping here.
 InfoMsg( aMsg );
 }
 
diff --git a/automation/source/testtool/cmdstrm.cxx 
b/automation/source/testtool/cmdstrm.cxx
index 023fc4c..6aba838 100644
--- a/automation/source/testtool/cmdstrm.cxx
+++ b/automation/source/testtool/cmdstrm.cxx
@@ -372,8 +372,8 @@ void CmdStream::GenCmdSlot( sal_uInt16 nNr, SbxArray* rPar )
 break;
 }
 
-/// #59513# nicht mehr ben�tigt ( siehe oben )
-//  rPar->Get( 2*n-1 )->SetUserData(nUserData); // Und wieder 
zur�cksetzen, so da� auch alles sauber ist.
+/// #59513# //don't need this

[Libreoffice-commits] .: tail_build/Makefile

2011-11-25 Thread Bjoern Michaelsen 
 tail_build/Makefile |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 538b1071531e895a55e2d6799806c3036f9ada49
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 13:02:36 2011 +0100

copy Makefile to everywhere was a bit too much of a shotgun approach

diff --git a/tail_build/Makefile b/tail_build/Makefile
index f9ac01e..625b0cb 100644
--- a/tail_build/Makefile
+++ b/tail_build/Makefile
@@ -30,10 +30,9 @@ ifeq ($(strip $(SOLARENV)),)
 include $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/../solenv/gbuild/source_and_rerun.mk
 else
 
-gb_PARTIALBUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath 
$(firstword $(MAKEFILE_LIST/Module*.mk)))
+$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk))
 
 endif
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: oox/source

2011-11-25 Thread Jan Holesovsky 
 oox/source/mathml/importutils.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15da1a153e85da6e8b3d33bb2ed10328bdfb9286
Author: Jan Holesovsky 
Date:   Fri Nov 25 13:18:03 2011 +0100

Fix build on Windows.

diff --git a/oox/source/mathml/importutils.cxx 
b/oox/source/mathml/importutils.cxx
index 8037e2b..c6bf80c 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -107,7 +107,7 @@ XmlStream::Tag::Tag( int t, const uno::Reference< 
xml::sax::XFastAttributeList >
 }
 
 
-XmlStream::XmlStream::Tag::operator bool() const
+XmlStream::Tag::operator bool() const
 {
 return token != XML_TOKEN_INVALID;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: setup_native/source

2011-11-25 Thread Fridrich Strba 
 setup_native/source/win32/customactions/shellextensions/makefile.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b0c3f12261538e3b89079e3b87bb8f8f0d39e5a0
Author: Fridrich Å trba 
Date:   Fri Nov 25 13:49:20 2011 +0100

Fix linking of the new custom action

diff --git 
a/setup_native/source/win32/customactions/shellextensions/makefile.mk 
b/setup_native/source/win32/customactions/shellextensions/makefile.mk
index e0950d9..b6961cf 100644
--- a/setup_native/source/win32/customactions/shellextensions/makefile.mk
+++ b/setup_native/source/win32/customactions/shellextensions/makefile.mk
@@ -75,6 +75,9 @@ STDSHL += \
 STDSHL+=   \
 $(KERNEL32LIB)\
 -lmsvcrt
+.ELSE
+STDSHL+=\
+psapi.lib
 .ENDIF
 
 SHL1OBJS = $(SLOFILES) \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-25 Thread Thorsten Behrens 
 sw/source/core/doc/docdraw.cxx |   80 -
 sw/source/core/doc/docedt.cxx  |  347 +++--
 2 files changed, 204 insertions(+), 223 deletions(-)

New commits:
commit 5aff8df5308d3db93dfb539fb0710e51309207d2
Author: Philipp Weissenbacher 
Date:   Fri Nov 25 00:45:15 2011 +0100

Translate German comments and translate some english comments spelling 
errors

diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index f3b02b4..afc66fe 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -53,12 +53,12 @@
 #include 
 #include 
 #include 
-#include   //Damit der RootDtor gerufen wird.
+#include   // So that the RootDtor is called.
 #include 
-#include// fuer MakeDrawView
+#include// for MakeDrawView
 #include 
 #include 
-#include// fuer die UndoIds
+#include// for the UndoIds
 #include 
 #include 
 #include 
@@ -219,7 +219,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 SwDrawContact* pNewContact = 0;
 if( bNoGroup )
 {
-//Ankerattribut aufheben.
+// Revoke anchor attribute.
 SwDrawContact *pMyContact = (SwDrawContact*)GetUserCall(pObj);
 const SwFmtAnchor aAnch( pMyContact->GetFmt()->GetAnchor() );
 
@@ -234,7 +234,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 static_cast(pMyContact->GetAnchoredObj( 
pObj ));
 bGroupMembersNotPositioned = pAnchoredDrawObj->NotYetPositioned();
 }
-//ContactObjekte und Formate vernichten.
+// Destroy ContactObjects and formats.
 for( sal_uInt16 i = 0; i < rMrkList.GetMarkCount(); ++i )
 {
 pObj = rMrkList.GetMark( i )->GetMarkedSdrObj();
@@ -249,7 +249,7 @@ SwDrawContact* SwDoc::GroupSelection( SdrView& rDrawView )
 #endif
 
 pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
-//loescht sich selbst!
+// Deletes itself!
 pContact->Changed(*pObj, SDRUSERCALL_DELETE, 
pObj->GetLastBoundRect() );
 pObj->SetUserCall( 0 );
 
@@ -458,13 +458,13 @@ sal_Bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
 ? 0
 : new SwUndoDrawDelete( 
(sal_uInt16)rMrkList.GetMarkCount() );
 
-//ContactObjekte vernichten, Formate sicherstellen.
+// Destroy ContactObjects, save formats.
 for( i = 0; i < rMrkList.GetMarkCount(); ++i )
 {
 const SdrMark& rMark = *rMrkList.GetMark( i );
 pObj = rMark.GetMarkedSdrObj();
 SwDrawContact *pContact = 
(SwDrawContact*)pObj->GetUserCall();
-if( pContact ) // natuerlich nicht bei gruppierten Objekten
+if( pContact ) // of course not for grouped objects
 {
 SwDrawFrmFmt *pFmt = (SwDrawFrmFmt*)pContact->GetFmt();
 // before delete of selection is performed, marked
@@ -475,7 +475,7 @@ sal_Bool SwDoc::DeleteSelection( SwDrawView& rDrawView )
 {
 OSL_FAIL( " is still marked for 
delete. application will crash!" );
 }
-//loescht sich selbst!
+// Deletes itself!
 pContact->Changed(*pObj, SDRUSERCALL_DELETE, 
pObj->GetLastBoundRect() );
 pObj->SetUserCall( 0 );
 
@@ -518,14 +518,14 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const 
SwFmtAnchor* pFlyAn,
 {
 if( pFmt->getIDocumentLayoutAccess()->GetCurrentViewShell() )   
//swmod 071107//swmod 071225
 {
-// Schauen, ob es ein SdrObject dafuer gibt
+// See if there is an SdrObject for it
 SwFlyFrm* pFly = SwIterator::FirstElement( 
*pFrmFmt );
 if( pFly )
 nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
 }
 else
 {
-// Schauen, ob es ein SdrObject dafuer gibt
+// See if there is an SdrObject for it
 SwFlyDrawContact* pContact = 
SwIterator::FirstElement( *pFrmFmt );
 if( pContact )
 nOrdNum = pContact->GetMaster()->GetOrdNum();
@@ -533,7 +533,7 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const 
SwFmtAnchor* pFlyAn,
 }
 else if( RES_DRAWFRMFMT == pFmt->Which() )
 {
-// Schauen, ob es ein SdrObject dafuer gibt
+// See if there is an SdrObject for it
 SwDrawContact* pContact = 
SwIterator::FirstElement( *pFrmFmt );
 if( pContact )
 nOrdNum = pContact->GetMaster()->GetOrdNum();
@@ -544,9 +544,9 @@ _ZSortFly::_ZSortFly( const SwFrmFmt* pFrmFmt, const 
SwFmtAnchor* pFlyAn,
 }
 
 /*/
-// Wird auch vom Sw3-Read

[Libreoffice-commits] .: sal/inc sal/osl

2011-11-25 Thread François Tigeot 
 sal/inc/osl/endian.h |   21 -
 sal/osl/unx/system.h |   16 
 2 files changed, 37 deletions(-)

New commits:
commit 3a1441c0d3107c69fd80492fa7e182d4f8c02d3d
Author: François Tigeot 
Date:   Fri Nov 25 10:38:14 2011 +0100

PDP_ENDIAN and variants are unused.

Remove their use from the code.

diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h
index 7069c3b..dace25b 100644
--- a/sal/inc/osl/endian.h
+++ b/sal/inc/osl/endian.h
@@ -61,8 +61,6 @@ extern "C" {
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #endif
 
@@ -76,8 +74,6 @@ extern "C" {
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #endif
 
@@ -85,13 +81,8 @@ extern "C" {
 #   include 
 #   if BYTE_ORDER == LITTLE_ENDIAN
 #   undef _BIG_ENDIAN
-#   undef _PDP_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
 #   undef _LITTLE_ENDIAN
-#   undef _PDP_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   undef _LITTLE_ENDIAN
-#   undef _BIG_ENDIAN
 #   endif
 #endif
 
@@ -103,8 +94,6 @@ extern "C" {
 #   define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
 #   define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #endif
 #endif
@@ -119,8 +108,6 @@ extern "C" {
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #endif
 
@@ -138,10 +125,6 @@ extern "C" {
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   ifndef _PDP_ENDIAN
-#   define _PDP_ENDIAN
-#   endif
 #   endif
 #endif
 
@@ -155,10 +138,6 @@ extern "C" {
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   ifndef _PDP_ENDIAN
-#   define _PDP_ENDIAN
-#   endif
 #   endif
 #endif
 
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index c8f4871..71b9b31 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -89,8 +89,6 @@
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif __BYTE_ORDER == __PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #   define  IORESOURCE_TRANSFER_BSD
 #   define  IOCHANNEL_TRANSFER_BSD_RENO
@@ -142,8 +140,6 @@
 #   define _LITTLE_ENDIAN_OO
 #   elif BYTE_ORDER == BIG_ENDIAN
 #   define _BIG_ENDIAN_OO
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   define _PDP_ENDIAN_OO
 #   endif
 #   define  IORESOURCE_TRANSFER_BSD
 #   define  IOCHANNEL_TRANSFER_BSD_RENO
@@ -179,8 +175,6 @@
 #   define _LITTLE_ENDIAN
 #   elif BYTE_ORDER == BIG_ENDIAN
 #   define _BIG_ENDIAN
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #endif
 #   define  NO_PTHREAD_RTL
@@ -248,8 +242,6 @@
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   define _PDP_ENDIAN
 #   endif
 #   define  SLEEP_TIMESPEC(timespec)nsleep(×pec, 0)
 #   define  LIBPATH "LIBPATH"
@@ -301,10 +293,6 @@
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   ifndef _PDP_ENDIAN
-#   define _PDP_ENDIAN
-#   endif
 #   endif
 #   define  IOCHANNEL_TRANSFER_BSD_RENO
 #   define  NO_PTHREAD_RTL
@@ -341,10 +329,6 @@ int macxp_resolveAlias(char *path, int buflen);
 #   ifndef _BIG_ENDIAN
 #   define _BIG_ENDIAN
 #   endif
-#   elif BYTE_ORDER == PDP_ENDIAN
-#   ifndef _PDP_ENDIAN
-#   define _PDP_ENDIAN
-#   endif
 #   endif
 #   define  IOCHANNEL_TRANSFER_BSD_RENO
 #   define  NO_PTHREAD_RTL
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: rsc/source

2011-11-25 Thread François Tigeot 
 rsc/source/rscpp/cpp5.c   |8 
 rsc/source/rscpp/cppdef.h |   11 ---
 2 files changed, 19 deletions(-)

New commits:
commit a5cabdbc747bfd13216bf45f50ec36ad28cfed53
Author: François Tigeot 
Date:   Fri Nov 25 14:42:10 2011 +0100

BIG_ENDIAN was never set

Remove its conditional code

diff --git a/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 4eb3183..24b13b9 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -750,19 +750,11 @@ evalchar(int skip)
  * We warn on multi-byte constants and try to hack
  * (big|little)endian machines.
  */
-#if BIG_ENDIAN
-count = 0;
-#endif
 while ((c = get()) != '\'' && c != EOF_CHAR && c != '\n') {
 if (!skip)
 ciwarn("multi-byte constant '%c' isn't portable", c);
-#if BIG_ENDIAN
-count += BITS_CHAR;
-value += (c << count);
-#else
 value <<= BITS_CHAR;
 value += c;
-#endif
 }
 instring = FALSE;
 return (value);
diff --git a/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
index 2490f1d..29b5d92 100644
--- a/rsc/source/rscpp/cppdef.h
+++ b/rsc/source/rscpp/cppdef.h
@@ -220,17 +220,6 @@
 #endif
 
 /*
- * BIG_ENDIAN is set TRUE on machines (such as the IBM 360 series)
- * where 'ab' stores 'a' in the high-bits and 'b' in the low-bits.
- * It is set FALSE on machines (such as the PDP-11 and Vax-11)
- * where 'ab' stores 'a' in the low-bits and 'b' in the high-bits.
- * (Or is it the other way around?) -- Warning: BIG_ENDIAN code is untested.
- */
-#ifndef BIG_ENDIAN
-#define BIG_ENDIAN  FALSE
-#endif
-
-/*
  * COMMENT_INVISIBLE may be defined to allow "old-style" comment
  * processing, whereby the comment becomes a zero-length token
  * delimiter.  This permitted tokens to be concatenated in macro
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild unotest/source

2011-11-25 Thread Bjoern Michaelsen 
 Makefile.in   |7 ++
 solenv/gbuild/JunitTest.mk|   14 +++--
 solenv/gbuild/Module.mk   |   10 +++
 solenv/gbuild/gbuild.mk   |4 +
 solenv/gbuild/platform/unxgcc.mk  |   26 +-
 unotest/source/java/org/openoffice/test/OfficeConnection.java |6 --
 6 files changed, 53 insertions(+), 14 deletions(-)

New commits:
commit bb149de2b4d3458c0db1958edbbb75e79a8a53c4
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 15:14:09 2011 +0100

some hints cleanup

diff --git a/Makefile.in b/Makefile.in
index 9f58d33..443305b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -46,13 +46,18 @@ dev-install: build
 printf \
 '\nDeveloper installation finished, you can now execute:\n\n' \
 && \
-if test `uname -s` = Darwin; then \
+if test `uname -s` = Linux; then \
+printf 'make debugrun\n'; \
+elif test `uname -s` = Darwin; then \
 printf 'open %s/install/LibreOffice.app\n' "@abs_builddir@"; \
 else \
 printf 'cd %s/install/program\n. ./ooenv\n./soffice.bin\n' \
 "@abs_builddir@"; \
 fi
 
+debugrun : dev-install
+   @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
+
 check : allcheck
@true
 
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 33d068c..ab0d67f 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -58,9 +58,15 @@ $(call gb_JunitTest_get_target,%) :
-e 'at java.lang.reflect.' \
-e 'at sun.reflect.' $@.log \
&& echo "see full error log at $@.log" \
-   && echo "to rerun just this failed test without all others, run 
either:" \
-   && echo "cd \$$MODULE && make $@" \
-   && echo "make -f $(SRCDIR)/GNUmakefile.mk $@" && false)) && \
+   && echo "to rerun just this failed test without all others, 
run:" \
+   && echo && echo "make $@" && echo \
+   && echo "add \"-f $(SRCDIR)/GNUmakefile.mk\" if you are not in 
the module dir" \
+   && echo "Or to do interactive debugging, run two shells with 
(Linux only):" \
+   && echo \
+   && echo "make debugrun" \
+   && echo "make gb_JunitTest_DEBUGRUN=T $@" \
+   && echo \
+   && false)) && \
 rm -rf $(call gb_JunitTest_get_userdir,$*))
$(CLEAN_CMD)
 
commit a65b46b71d0f95119b343f4e931a318703889b08
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 14:38:18 2011 +0100

remove debugcommand -- debugrun is superceding it

diff --git a/unotest/source/java/org/openoffice/test/OfficeConnection.java 
b/unotest/source/java/org/openoffice/test/OfficeConnection.java
index 8f99076..ae2cae0 100644
--- a/unotest/source/java/org/openoffice/test/OfficeConnection.java
+++ b/unotest/source/java/org/openoffice/test/OfficeConnection.java
@@ -105,12 +105,6 @@ public final class OfficeConnection {
 assertNull(waitForProcess(process, 1000)); // 1 sec
 }
 }
-try {
-ProcessBuilder debugbp = new ProcessBuilder(
-Argument.get("debugcommand").split(" "));
-debugbp.start();
-Thread.sleep(1000);
-} catch(Exception e) {}
 }
 
 /** Shut down the OOo instance.
commit b684a5bb0374719976accaa9cedca44fa3d821ad
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 14:36:18 2011 +0100

create debugrun target, adjust JunitTests to them

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 3003c9d..33d068c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -50,8 +50,6 @@ $(call gb_JunitTest_get_target,%) :
mkdir -p $(call gb_JunitTest_get_userdir,$*) && \
 ($(gb_JunitTest_JAVACOMMAND) \
 -cp "$(CLASSPATH)" \
-$(if $(strip $(gb_JunitTest_DEBUGCOMMAND)),\
-
'-Dorg.openoffice.test.arg.debugcommand=$(gb_JunitTest_DEBUGCOMMAND)') \
 $(DEFS) \
 org.junit.runner.JUnitCore \
 $(CLASSES) 2>&1 > $@.log || \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 82da041..582d960 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -112,6 +112,10 @@ check : unitcheck
$(call gb_Output_announce_title,all tests checked.)
$(call gb_Output_announce_bell)

+debugrun : build
+   $(call gb_Module_DEBUGRUNCOMMAND)
+
+
 
 ifeq ($(strip $(gb_PARTIALBUILD)),)
 check : subsequentcheck
@@ -149,6 +153,10 @@ endif
 
 endef
 
+# Dont recurse in subdirs for help an debugrun
+
+ifeq ($(filter help debugrun,$(MAKECMDGOALS)),)
+
 define gb_Module_add_target
 $(call gb_

[Libreoffice-commits] .: Makefile.in

2011-11-25 Thread Bjoern Michaelsen 
 Makefile.in |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 19b5d81f92363f1448dcf41930d973b8b04db11b
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 15:24:49 2011 +0100

move workaround for old build system to other workarounds

diff --git a/Makefile.in b/Makefile.in
index 443305b..82dca9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,7 +55,7 @@ dev-install: build
 "@abs_builddir@"; \
 fi
 
-debugrun : dev-install
+debugrun:
@. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
 
 check : allcheck
@@ -173,3 +173,4 @@ findunusedcode:
 unitcheck: build
 subsequentcheck: dev-install
 allcheck : dev-install
+debugrun : dev-install
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/source

2011-11-25 Thread Noel Power 
 vcl/source/window/toolbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93a5933060f61a5fb585148e4125a8ab22305259
Author: Noel Power 
Date:   Fri Nov 25 14:25:46 2011 +

really limit special layout to single line non-floating toolbars

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 1016301..3531ea1 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -2721,7 +2721,7 @@ void ToolBox::ImplFormat( sal_Bool bResize )
 if ( mbHorz )
 {
 it->maCalcRect.Left() = nX;
-if ( meLayoutMode == TBX_LAYOUT_TOP && mnLines )
+if ( meLayoutMode == TBX_LAYOUT_TOP && mnLines == 1 )
 it->maCalcRect.Top()  = nY/2;
 else
 it->maCalcRect.Top()  = 
nY+(nLineSize-aCurrentItemSize.Height())/2;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - scp2/source solenv/inc

2011-11-25 Thread Lior Kaplan 
 scp2/source/ooo/module_helppack.ulf |  180 
 scp2/source/ooo/module_langpack.ulf |  180 
 solenv/inc/langlist.mk  |   24 ++--
 3 files changed, 12 insertions(+), 372 deletions(-)

New commits:
commit 6cf8f6e737fdb35fa56713117baa617c02ed4dab
Author: Lior Kaplan 
Date:   Fri Nov 25 17:13:53 2011 +0200

Clean help pack list based on the current files in the translation 
repository
(translations/source/)

diff --git a/scp2/source/ooo/module_helppack.ulf 
b/scp2/source/ooo/module_helppack.ulf
index 4737584..18ac86e 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -193,36 +193,18 @@ en-US = "Punjabi"
 [STR_DESC_MODULE_HELPPACK_PA_IN]
 en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_GU_IN]
-en-US = "Gujarati"
-
-[STR_DESC_MODULE_HELPPACK_GU_IN]
-en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_TA]
 en-US = "Tamil"
 
 [STR_DESC_MODULE_HELPPACK_TA]
 en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_TA_IN]
-en-US = "Tamil"
-
-[STR_DESC_MODULE_HELPPACK_TA_IN]
-en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_HI]
 en-US = "Hindi"
 
 [STR_DESC_MODULE_HELPPACK_HI]
 en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_HI_IN]
-en-US = "Hindi"
-
-[STR_DESC_MODULE_HELPPACK_HI_IN]
-en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_ST]
 en-US = "Southern Sotho (Sutu)"
 
@@ -253,12 +235,6 @@ en-US = "Afrikaans"
 [STR_DESC_MODULE_HELPPACK_AF]
 en-US = "Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_SW]
-en-US = "Swahili"
-
-[STR_DESC_MODULE_HELPPACK_SW]
-en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_SW_TZ]
 en-US = "Swahili"
 
@@ -283,42 +259,18 @@ en-US = "Bengali"
 [STR_DESC_MODULE_HELPPACK_BN]
 en-US = "Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_BN_BD]
-en-US = "Bengali (Bangladesh)"
-
-[STR_DESC_MODULE_HELPPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION"
-
-[STR_NAME_MODULE_HELPPACK_BN_IN]
-en-US = "Bengali (India)"
-
-[STR_DESC_MODULE_HELPPACK_BN_IN]
-en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_OR]
 en-US = "Oriya"
 
 [STR_DESC_MODULE_HELPPACK_OR]
 en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_OR_IN]
-en-US = "Oriya"
-
-[STR_DESC_MODULE_HELPPACK_OR_IN]
-en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_MR]
 en-US = "Marathi"
 
 [STR_DESC_MODULE_HELPPACK_MR]
 en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_MR_IN]
-en-US = "Marathi"
-
-[STR_DESC_MODULE_HELPPACK_MR_IN]
-en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_NE]
 en-US = "Nepali"
 
@@ -331,12 +283,6 @@ en-US = "Arabic"
 [STR_DESC_MODULE_HELPPACK_AR]
 en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_AR_SA]
-en-US = "Arabic"
-
-[STR_DESC_MODULE_HELPPACK_AR_SA]
-en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_CA]
 en-US = "Catalan"
 
@@ -385,12 +331,6 @@ en-US = "Norwegian (Nynorsk)"
 [STR_DESC_MODULE_HELPPACK_NN]
 en-US = "Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_RM]
-en-US = "Rhaeto-Romance"
-
-[STR_DESC_MODULE_HELPPACK_RM]
-en-US = "Installs Rhaeto-Romance help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_RO]
 en-US = "Romanian"
 
@@ -403,12 +343,6 @@ en-US = "Albanian"
 [STR_DESC_MODULE_HELPPACK_SQ]
 en-US = "Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_UR]
-en-US = "Urdu"
-
-[STR_DESC_MODULE_HELPPACK_UR]
-en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_ID]
 en-US = "Indonesian"
 
@@ -445,12 +379,6 @@ en-US = "Lithuanian"
 [STR_DESC_MODULE_HELPPACK_LT]
 en-US = "Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_HY]
-en-US = "Armenian"
-
-[STR_DESC_MODULE_HELPPACK_HY]
-en-US = "Installs Armenian help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_EU]
 en-US = "Basque"
 
@@ -463,12 +391,6 @@ en-US = "Macedonian"
 [STR_DESC_MODULE_HELPPACK_MK]
 en-US = "Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_HELPPACK_MT]
-en-US = "Maltese"
-
-[STR_DESC_MODULE_HELPPACK_MT]
-en-US = "Installs Maltese help in %PRODUCTNAME %PRODUCTVERSION"
-
 [STR_NAME_MODULE_HELPPACK_CY]
 en-US = "Welsh"
 
@@ -481,12 +403,6 @@ en-US = "Galician"
 [STR_DESC_MODULE_HELPPACK_GL]
 en-US = "Installs Galician

[Libreoffice-commits] .: sdext/source

2011-11-25 Thread Thorsten Behrens 
 sdext/source/pdfimport/test/export.map  |2 
 sdext/source/pdfimport/test/makefile.mk |   28 +--
 sdext/source/pdfimport/test/tests.cxx   |   80 
 3 files changed, 25 insertions(+), 85 deletions(-)

New commits:
commit b0e1f784080a0f78689b8166f296069c7c2fb8ad
Author: Thorsten Behrens 
Date:   Fri Nov 25 16:43:02 2011 +0100

First cut at making pdfimport unit tests work again.

diff --git a/sdext/source/pdfimport/test/export.map 
b/sdext/source/pdfimport/test/export.map
index 7321bbc..3308588 100755
--- a/sdext/source/pdfimport/test/export.map
+++ b/sdext/source/pdfimport/test/export.map
@@ -27,7 +27,7 @@
 
 UDK_3_0_0 {
 global:
-registerAllTestFunction;
+cppunitTestPlugIn;
 
 local:
 *;
diff --git a/sdext/source/pdfimport/test/makefile.mk 
b/sdext/source/pdfimport/test/makefile.mk
index b6f60d5..fdc3966 100755
--- a/sdext/source/pdfimport/test/makefile.mk
+++ b/sdext/source/pdfimport/test/makefile.mk
@@ -70,6 +70,8 @@ SHL1STDLIBS=\
 $(CPPUNITLIB)  \
 $(ZLIB3RDLIB)  \
 $(CPPULIB) \
+$(UNOTESTLIB)   \
+$(TESTLIB)  \
 $(SALLIB)
 
 
@@ -135,27 +137,5 @@ APP2STDLIBS=\
 
 # --- Targets --
 
-  .INCLUDE : target.mk
-  .INCLUDE : _cppunit.mk
-
-# --- Fake uno bootstrap & copy testfile 
-
-  $(BIN)$/pdfi_unittest_test.pdf : testinput.pdf
-  rm -f $@
-  $(GNUCOPY) testinput.pdf $@
-
-  $(BIN)$/pdfi_unittest_test.ini : makefile.mk
-  rm -f $@
-  @echo UNO_SERVICES= > $@
-  @echo UNO_TYPES=$(UNOUCRRDB:s/\/\\/) >> $@
-
-# --- Enable testshl2 execution in normal build 
-
-  $(MISC)$/pdfi_unittest_succeeded : $(SHL1TARGETN) 
$(BIN)$/pdfi_unittest_test.pdf $(BIN)$/pdfi_unittest_test.ini
-  rm -f $(BIN)$/pdfi_unittest_draw.xml
-  rm -f $(BIN)$/pdfi_unittest_writer.xml
-  @echo --
-  @echo - start unit test on library $(SHL1TARGETN)
-  @echo --
-  testshl2 -forward $(BIN)$/ $(SHL1TARGETN)
-   $(TOUCH) $@
+.INCLUDE : target.mk
+.INCLUDE : _cppunit.mk
diff --git a/sdext/source/pdfimport/test/tests.cxx 
b/sdext/source/pdfimport/test/tests.cxx
index 145f938..cffb336 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -29,6 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sdext.hxx"
 
+#include "sal/config.h"
+#include "sal/precppunit.hxx"
+
 #define BASEGFX_STATICLIBRARY
 
 #ifdef SYSTEM_ZLIB
@@ -47,12 +50,17 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
+#include "cppunit/TestAssert.h"
+#include "cppunit/TestFixture.h"
+#include "cppunit/extensions/HelperMacros.h"
+#include "cppunit/plugin/TestPlugIn.h"
+#include 
 
 #include 
 #include 
@@ -471,58 +479,17 @@ namespace
 bool  m_bDashedLineSeen;
 };
 
-class PDFITest : public CppUnit::TestFixture
+class PDFITest : public test::BootstrapFixture
 {
-uno::Reference mxCtx;
-rtl::OUString  msBaseDir;
-bool   mbUnoInitialized;
-
 public:
-PDFITest() : mxCtx(),msBaseDir(),mbUnoInitialized(false)
-{}
-
-void setUp()
-{
-if( !mbUnoInitialized )
-{
-const char* pArgs( getForwardString() );
-CPPUNIT_ASSERT_MESSAGE("Test file parameter", pArgs);
-
-msBaseDir = rtl::OUString::createFromAscii(pArgs);
-
-// bootstrap UNO
-try
-{
-::rtl::OUString aIniUrl;
-CPPUNIT_ASSERT_MESSAGE(
-"Converting ini file to URL",
-osl_getFileURLFromSystemPath(
-
(msBaseDir+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.ini"))).pData,
-&aIniUrl.pData ) == osl_File_E_None );
-
-mxCtx = 
::cppu::defaultBootstrap_InitialComponentContext(aIniUrl);
-CPPUNIT_ASSERT_MESSAGE("Getting component context", 
mxCtx.is());
-}
-catch( uno::Exception& )
-{
-CPPUNIT_ASSERT_MESSAGE("Bootstrapping UNO", false);
-}
-
-mbUnoInitialized = true;
-}
-}
-void tearDown()
-{
-}
-
 void testXPDFParser()
 {
 pdfi::ContentSinkSharedPtr pSink( new TestSink() );
-pdfi::xpdf_ImportFromFile( msBaseDir + 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pdfi_unittest_test.pdf")),
+pdfi::xpdf_ImportFromFil

[Libreoffice-commits] .: 3 commits - Makefile.in solenv/gbuild

2011-11-25 Thread Bjoern Michaelsen 
 Makefile.in  |   12 ++--
 solenv/gbuild/platform/unxgcc.mk |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f8b7720ca56e16d718593da8fc394dd91362fbf1
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 16:44:45 2011 +0100

dev-install seems to poison the env

diff --git a/Makefile.in b/Makefile.in
index 78608d7..86acb64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,4 +173,4 @@ findunusedcode:
 unitcheck: build
 subsequentcheck: dev-install
 allcheck : dev-install
-debugrun : dev-install
+#debugrun : dev-install # disabled for now, this dep seems to poison the 
debugrun !?
commit c036777b4930e5c4ab34f035b8de749a7f80e42a
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 16:41:28 2011 +0100

gbuild need no env anymore

diff --git a/Makefile.in b/Makefile.in
index 82dca9a..78608d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -56,16 +56,16 @@ dev-install: build
 fi
 
 debugrun:
-   @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk debugrun
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/GNUmakefile.mk debugrun
 
 check : allcheck
@true
 
 %check:
-   @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
-   $(if @VERBOSE@,,-s) --jobs="$(if \
-  
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
-   $(patsubst allcheck,check,$@)
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$)MAKEFILE_LIST/GNUmakefile.mk -r \
+   $(if @VERBOSE@,,-s) --jobs="$(if \
+  
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
+   $(patsubst allcheck,check,$@)
 
 cross-build-toolset:
@. ./Env.Build.sh && \
commit faa11fecdbca8cdba62a6cc5610c311fcbe0e607
Author: Bjoern Michaelsen 
Date:   Fri Nov 25 16:40:02 2011 +0100

fix default junit soffice path

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index d34d4a1..9d07c9f 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -383,7 +383,7 @@ else
 ifneq ($(gb_JunitTest_DEBUGRUN),)
 gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER)
 else
-gb_JunitTest_SOFFICEARG:=$(OUTDIR)/installation/opt/program/soffice" 
+gb_JunitTest_SOFFICEARG:=path:$(OUTDIR)/installation/opt/program/soffice
 endif
 endif
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'feature/ooxmlmathimport' - 4 commits - oox/inc oox/source starmath/inc starmath/source sw/inc sw/source writerfilter/source

2011-11-25 Thread Lubos Lunak 
 oox/inc/oox/mathml/import.hxx |   14 ++---
 oox/inc/oox/mathml/importutils.hxx|   21 +++
 oox/source/mathml/import.cxx  |4 -
 starmath/inc/unomodel.hxx |1 
 starmath/source/ooxmlimport.cxx   |   16 +++---
 starmath/source/unomodel.cxx  |5 +
 sw/inc/docsh.hxx  |2 
 sw/inc/unotxdoc.hxx   |5 -
 sw/source/core/unocore/unoframe.cxx   |   10 +++
 sw/source/ui/app/docsh2.cxx   |   12 
 sw/source/ui/uno/unotxdoc.cxx |5 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   58 --
 12 files changed, 85 insertions(+), 68 deletions(-)

New commits:
commit dc4ca1bd0cf5e42009c92bd76c0d7d5ed23cb3ab
Author: Luboš Luňák 
Date:   Fri Nov 25 17:08:17 2011 +0100

set properly initial size of starmath component when importing docx

diff --git a/oox/inc/oox/mathml/import.hxx b/oox/inc/oox/mathml/import.hxx
index 7154264..8c922ab 100644
--- a/oox/inc/oox/mathml/import.hxx
+++ b/oox/inc/oox/mathml/import.hxx
@@ -29,6 +29,7 @@
 #define _STARMATHIMPORT_HXX
 
 #include 
+#include 
 
 #include 
 
@@ -40,11 +41,17 @@ namespace formulaimport
 class XmlStream;
 }
 
+/**
+ Interface class, StarMath will implement readFormulaOoxml() to read OOXML
+ representing the formula and getFormulaSize() to provide the size of the 
resulting
+ formula.
+ */
 class OOX_DLLPUBLIC FormulaImportBase
 {
 public:
 FormulaImportBase();
 virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream ) = 0;
+virtual Size getFormulaSize() const = 0;
 };
 
 } // namespace
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 5243d41..cf01ec4 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -108,6 +108,7 @@ public:
 virtual void writeFormulaOoxml( ::sax_fastparser::FSHelperPtr 
m_pSerializer, oox::core::OoxmlVersion version );
 // oox::FormulaImportBase
 virtual void readFormulaOoxml( oox::formulaimport::XmlStream& stream );
+virtual Size getFormulaSize() const;
 
 static ::com::sun::star::uno::Sequence< rtl::OUString > 
getSupportedServiceNames_Static();
 static ::rtl::OUString getImplementationName_Static();
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 4f0d2f0..35cb20d 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -1142,4 +1142,9 @@ void SmModel::readFormulaOoxml( 
oox::formulaimport::XmlStream& stream )
 static_cast< SmDocShell* >( GetObjectShell())->readFormulaOoxml( stream );
 }
 
+Size SmModel::getFormulaSize() const
+{
+return static_cast< SmDocShell* >( GetObjectShell())->GetSize();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5892864..4174964 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -75,6 +75,7 @@
 #include 
 #include 
 #include "FieldTypes.hxx"
+#include 
 
 #include 
 #ifdef DEBUG_DOMAINMAPPER
@@ -1102,6 +1103,15 @@ void DomainMapper_Impl::appendStarMath( const Value& val 
)
 
 
xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_STREAM_NAME ),
 val.getAny());
+
+uno::Reference< uno::XInterface > xInterface( 
formula->getComponent(), uno::UNO_QUERY );
+Size size( 1000, 1000 );
+if( oox::FormulaImportBase* formulaimport = dynamic_cast< 
oox::FormulaImportBase* >( xInterface.get()))
+size = formulaimport->getFormulaSize();
+
xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_WIDTH ),
+uno::makeAny( int(size.Width(;
+
xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_HEIGHT ),
+uno::makeAny( int(size.Height(;
 // mimic the treatment of graphics here.. it seems anchoring as 
character
 // gives a better ( visually ) result
 
xStarMathProperties->setPropertyValue(PropertyNameSupplier::GetPropertyNameSupplier().GetName(
 PROP_ANCHOR_TYPE ),
commit 0f73f21fd1aef26222f2568d343dcffe3e2a6c17
Author: Luboš Luňák 
Date:   Fri Nov 25 15:15:47 2011 +0100

the bit hackish addFormula() shortcut is no longer necessary

diff --git a/oox/inc/oox/mathml/import.hxx b/oox/inc/oox/mathml/import.hxx
index 961a4f6..7154264 100644
--- a/oox/inc/oox/mathml/import.hxx
+++ b/oox/inc/oox/mathml/import.hxx
@@ -40,13 +40,6 @@ namespace formulaimport
 class XmlStream;
 }
 
-class OOX_DLLPUBLIC FormulaImportHelper
-{
-public:
-FormulaImportHelper();
-virtual void addFormula( com::sun::star:

[Libreoffice-commits] .: Makefile.in

2011-11-25 Thread Stephan Bergmann 
 Makefile.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8fc420f4fa18a92eedd6bb7b34c8bc36ee2bac41
Author: Stephan Bergmann 
Date:   Fri Nov 25 17:17:19 2011 +0100

typo

diff --git a/Makefile.in b/Makefile.in
index 86acb64..8ea483d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,7 +62,7 @@ check : allcheck
@true
 
 %check:
-   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$)MAKEFILE_LIST/GNUmakefile.mk -r \
+   @ @GNUMAKE@ -f $(dir $(realpath $(firstword 
$(MAKEFILE_LIST/GNUmakefile.mk -r \
$(if @VERBOSE@,,-s) --jobs="$(if \
   
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
$(patsubst allcheck,check,$@)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - connectivity/source solenv/gbuild solenv/inc

2011-11-25 Thread Tor Lillqvist 
 connectivity/source/inc/hsqldb/HStorageAccess.hxx |8 
 solenv/gbuild/platform/ANDROID_ARM_GCC.mk |   11 +++
 solenv/inc/unxandr.mk |   10 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 1171165b587480d9dde9c378b2998f3c26b83220
Author: Tor Lillqvist 
Date:   Fri Nov 25 17:53:51 2011 +0200

Fix Android compilation: 'NULL' was not declared in this scope

diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx 
b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index 079d8c7..dc9151d 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -36,10 +36,10 @@ namespace connectivity { namespace hsqldb
 class DataLogFile;
 } }
 
-jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, 
jstring key, ::connectivity::hsqldb::DataLogFile* logger = NULL );
-jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject 
obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, 
::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, 
jstring name, jstring key, jbyteArray buffer, jint off, jint len, 
::connectivity::hsqldb::DataLogFile* logger = NULL );
-void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, 
jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = NULL );
+jint read_from_storage_stream( JNIEnv * env, jobject obj_this, jstring name, 
jstring key, ::connectivity::hsqldb::DataLogFile* logger = 0 );
+jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject 
obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len, 
::connectivity::hsqldb::DataLogFile* logger = 0 );
+void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, 
jstring name, jstring key, jbyteArray buffer, jint off, jint len, 
::connectivity::hsqldb::DataLogFile* logger = 0 );
+void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, 
jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = 0 );
 
 #endif // CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
 
commit ea19e7243b3a4bd49cbad0cf03a5e9f50b2e3148
Author: Tor Lillqvist 
Date:   Fri Nov 25 14:06:28 2011 +0200

No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker

diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk 
b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index cbcd3e6..53e571c 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -78,4 +78,15 @@ gb_Library_FILENAMES := \
$(foreach 
lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT))
 \
 
 
+# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
+# don't bother generating such.
+
+define gb_Library_get_rpath
+endef
+
+define gb_Executable_get_rpath
+endef
+
+gb_LinkTarget_LDFLAGS := $(subst 
-Wl$(COMMA)-rpath-link$(COMMA)$(SYSBASE)/lib:$(SYSBASE)/usr/lib,,$(gb_LinkTarget_LDFLAGS))
+
 # vim: set noet sw=4:
diff --git a/solenv/inc/unxandr.mk b/solenv/inc/unxandr.mk
index 49b481a..9d172df 100644
--- a/solenv/inc/unxandr.mk
+++ b/solenv/inc/unxandr.mk
@@ -52,5 +52,13 @@ STDSHLCUIMT+=-llog -landroid -lgnustl_shared
 
 # All shared libraries we build must start with "lib" because
 # otherwise the Android package installer will not unpack them from
-# the .apk into the app's lib directory
+# the .apk into the app's lib directory.
 ENFORCEDSHLPREFIX=lib
+
+# No DT_RPATH or DT_RUNPATH support in the Bionic dynamic linker so
+# don't bother generating such.
+
+LINKFLAGSRUNPATH_URELIB=
+LINKFLAGSRUNPATH_UREBIN=
+LINKFLAGSRUNPATH_OOO=
+LINKFLAGSRUNPATH_SDK=
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

2011-11-25 Thread Petr Mladek 
 scp2/source/ooo/module_ooo.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1221e6a9e44f080b8e5fc5d3fdf3a708b6e382ab
Author: Petr Mladek 
Date:   Fri Nov 25 17:55:04 2011 +0100

correctly install Latvian dictionary

the typo caused that the Latvian dictionary was included into core01 package
and broke langpacks

diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 196c1c2..8afa37d 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -300,7 +300,7 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Lv
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LV );
-Files = (gid_File_Extension_Dictionary_Lt);
+Files = (gid_File_Extension_Dictionary_Lv);
 InstallOrder = "2000";
 Sortkey = "635";
 Spellcheckerlanguage = "lv";
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] Changes to 'feature/nlpflatten'

2011-11-25 Thread Michael Meeks 
New branch 'feature/nlpflatten' available with the following commits:
commit f2f3ac84d49bdaf8fe3c1c6036cb477ffd4f16f0
Author: Michael Meeks 
Date:   Fri Nov 25 14:48:18 2011 +

nlpsolver: migrate the build to use native gnumake build

Remove dmake, build.pl and ant build cruft. Update extension
description, cleanup file locations etc.

commit e4b8dd5bd72f285d50088085628997a0d93a3de6
Author: Michael Meeks 
Date:   Fri Nov 25 12:44:22 2011 +

move translation files into the correct place

commit 6e5b10b17fbcbb4db76bcb1db5177fb3ab0cf46e
Author: Michael Meeks 
Date:   Fri Nov 25 12:41:39 2011 +

Flatten un-maintained ex. Sun/Oracle nlpsolver extension into the repo

This should make it easier to hack, and also to separate out the tangled in
third party EvolutionarySolver as/when we can.

___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - i18npool/source

2011-11-25 Thread Eike Rathke 
 i18npool/source/localedata/data/pt_PT.xml |   49 +-
 1 file changed, 28 insertions(+), 21 deletions(-)

New commits:
commit 0e0b3dfc9a13794b2f0137676ccfe0fe608f2864
Author: Eike Rathke 
Date:   Fri Nov 25 17:27:19 2011 +0100

added [pt-PT] legacyOnly currency to cope with change from Esc. to $

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index 1fbacd9..2d0f18d 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -34,7 +34,7 @@
 PM
 Metric
 
-
+
 
 DD-MM-
 
@@ -337,6 +337,13 @@
 
 
 
+
+PTE
+Esc.
+PTE
+Escudo
+2
+
 
 PTE
 $
commit 06b6e220b5e9250c688daaea4a7eb2ae64f1863c
Author: Sérgio Marques 
Date:   Fri Nov 25 17:23:25 2011 +0100

updated Portuguese [pt-PT] locale data

diff --git a/i18npool/source/localedata/data/pt_PT.xml 
b/i18npool/source/localedata/data/pt_PT.xml
index df6ce1d..1fbacd9 100644
--- a/i18npool/source/localedata/data/pt_PT.xml
+++ b/i18npool/source/localedata/data/pt_PT.xml
@@ -156,7 +156,7 @@
 
 
 
-Estandar
+Geral
 
 
 
@@ -222,38 +222,38 @@
 
 
 sun
-Dom
-Domingo
+dom
+domingo
 
 
 mon
-Seg
-Segunda-feira
+seg
+segunda-feira
 
 
 tue
-Ter
-Terça-feira
+ter
+terça-feira
 
 
 wed
-Qua
-Quarta-feira
+qua
+quarta-feira
 
 
 thu
-Qui
-Quinta-feira
+qui
+quinta-feira
 
 
 fri
-Sex
-Sexta-feira
+sex
+sexta-feira
 
 
 sat
-Sáb
-Sábado
+sáb
+sábado
 
 
 
@@ -321,13 +321,13 @@
 
 
 bc
-a.c.
-a.c.
+aC
+aC
 
 
 ad
-d.c.
-d.c.
+dC
+dC
 
 
 
@@ -339,7 +339,7 @@
 
 
 PTE
-Esc.
+$
 PTE
 Escudo
 2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

2011-11-25 Thread Stephan Bergmann 
 solenv/gbuild/JunitTest.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 58932ca2426320df5c7d7ec97cf2ad65f6539b22
Author: Stephan Bergmann 
Date:   Fri Nov 25 19:07:19 2011 +0100

fix stderr piping

diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index ab0d67f..b6ce903 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -52,7 +52,7 @@ $(call gb_JunitTest_get_target,%) :
 -cp "$(CLASSPATH)" \
 $(DEFS) \
 org.junit.runner.JUnitCore \
-$(CLASSES) 2>&1 > $@.log || \
+$(CLASSES) > $@.log 2>&1 || \
(grep -v -e 'at org.junit.' \
-e 'at com.sun.star.lib.uno.' \
-e 'at java.lang.reflect.' \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: i18npool/source

2011-11-25 Thread Eike Rathke 
 i18npool/source/localedata/LocaleNode.cxx |   44 +++---
 i18npool/source/localedata/LocaleNode.hxx |3 ++
 i18npool/source/localedata/data/ga_IE.xml |4 +-
 i18npool/source/localedata/data/my_MM.xml |7 
 i18npool/source/localedata/data/wa_BE.xml |2 -
 5 files changed, 53 insertions(+), 7 deletions(-)

New commits:
commit 4e34d8fd5b64a18dd17faf4ed4d603648bab8311
Author: Eike Rathke 
Date:   Fri Nov 25 19:37:35 2011 +0100

added check if locale data's usedInCompatibleFormatCodes currency is really 
used there

and fixed the cases discovered by the check ...

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 8d7d1a3..88c26b5 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -337,6 +337,12 @@ void LocaleNode::incErrorStr( const char* pStr, const 
::rtl::OUString& rVal ) co
 fprintf( stderr, prepareErrorFormat( pStr, ": %s"), OSTR( rVal));
 }
 
+void LocaleNode::incErrorStrStr( const char* pStr, const ::rtl::OUString& 
rVal1, const ::rtl::OUString& rVal2 ) const
+{
+++nError;
+fprintf( stderr, prepareErrorFormat( pStr, ": %s %s"), OSTR( rVal1), OSTR( 
rVal2));
+}
+
 void LCInfoNode::generateCode (const OFileWriter &of) const
 {
 
@@ -590,13 +596,17 @@ void LCCTYPENode::generateCode (const OFileWriter &of) 
const
 }
 
 
+static OUString sTheCompatibleCurrency;
+
 sal_Int16 LCFormatNode::mnSection = 0;
 sal_Int16 LCFormatNode::mnFormats = 0;
 
 void LCFormatNode::generateCode (const OFileWriter &of) const
 {
 OUString str;
-if (mnSection >= 2)
+if (mnSection == 0)
+sTheCompatibleCurrency = OUString();
+else if (mnSection >= 2)
 incError("more than 2 LC_FORMAT sections");
 OUString strFrom( getAttr().getValueByName("replaceFrom"));
 of.writeParameter("replaceFrom", strFrom, mnSection);
@@ -607,6 +617,13 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 if (str.endsWithIgnoreAsciiCaseAsciiL( "-]", 6))
 incErrorStr("replaceTo=\"%s\" needs  to be adapted to the real 
LangID value.", str);
 of.writeParameter("replaceTo", str, mnSection);
+// Remember the currency symbol if present.
+if (str.indexOfAsciiL( "[$", 2) == 0)
+{
+sal_Int32 nHyphen = str.indexOf( '-');
+if (nHyphen >= 3)
+sTheCompatibleCurrency = str.copy( 2, nHyphen - 2);
+}
 ::rtl::OUString useLocale =   getAttr().getValueByName("ref");
 if (useLocale.getLength() > 0) {
 switch (mnSection)
@@ -710,14 +727,27 @@ void LCFormatNode::generateCode (const OFileWriter &of) 
const
 }
 }
 break;
-// Currency formats should be something like [C]###0;-[C]###0
-// and not parenthesized [C]###0;([C]###0) if not en_US.
+case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
+// Remember the currency symbol if present.
+{
+sal_Int32 nStart;
+if (sTheCompatibleCurrency.isEmpty() &&
+((nStart = n->getValue().indexOfAsciiL( "[$", 
2)) >= 0))
+{
+OUString aCode( n->getValue());
+sal_Int32 nHyphen = aCode.indexOf( '-', nStart);
+if (nHyphen >= nStart + 3)
+sTheCompatibleCurrency = aCode.copy( nStart + 
2, nHyphen - nStart - 2);
+}
+}
+// fallthru
 case cssi::NumberFormatIndex::CURRENCY_1000INT :
 case cssi::NumberFormatIndex::CURRENCY_1000INT_RED :
-case cssi::NumberFormatIndex::CURRENCY_1000DEC2 :
 case cssi::NumberFormatIndex::CURRENCY_1000DEC2_RED :
 case cssi::NumberFormatIndex::CURRENCY_1000DEC2_CCC :
 case cssi::NumberFormatIndex::CURRENCY_1000DEC2_DASHED :
+// Currency formats should be something like 
[C]###0;-[C]###0
+// and not parenthesized [C]###0;([C]###0) if not en_US.
 if (strcmp( of.getLocale(), "en_US") != 0)
 {
 OUString aCode( n->getValue());
@@ -1549,6 +1579,12 @@ void LCCurrencyNode :: generateCode (const OFileWriter 
&of) const
 incError( "CurrencyID is not ISO 4217");
 str = currencyNode -> findNode ("CurrencySymbol") -> getValue();
 of.writeParameter("currencySymbol", str, nbOfCurrencies);
+// Check if this currency really is the one used in number format 
+// codes. In case of ref=... mechanisms it may be that TheCurrency 
+// couldn't had been determined from the current locale (i.e. is 
+// empty), silently assume the referred locale has things right.
+

[Libreoffice-commits] .: 2 commits - reportdesign/inc reportdesign/source tools/source

2011-11-25 Thread Caolán McNamara 
 reportdesign/inc/RptObject.hxx |4 ++
 reportdesign/source/core/sdr/RptObject.cxx |   58 ++---
 tools/source/stream/strmunx.cxx|2 -
 tools/source/stream/strmwnt.cxx|6 +--
 4 files changed, 45 insertions(+), 25 deletions(-)

New commits:
commit 9eac8b2d2d5b77e1aa537a8e3756ffbbb10d7e0e
Author: Caolán McNamara 
Date:   Fri Nov 25 20:16:36 2011 +

Resolves: fdo#39950 fix dnd crash from default assignment operators

diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 056a06c..4084a47 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -224,6 +224,8 @@ public:
 virtual OOle2Obj* Clone() const;
 virtual void initializeOle();
 
+OOle2Obj& operator=(const OOle2Obj& rObj);
+
 void initializeChart( const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel>& _xModel);
 };
 
@@ -275,6 +277,8 @@ public:
 virtual sal_uInt32 GetObjInventor() const;
 virtual OUnoObject* Clone() const;
 
+OUnoObject& operator=(const OUnoObject& rObj);
+
 private:
 voidimpl_setReportComponent_nothrow();
 voidimpl_initializeModel_nothrow();
diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index 09bf340..b50945a 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -941,18 +941,24 @@ uno::Reference< uno::XInterface > 
OUnoObject::getUnoShape()
 {
 return OObjectBase::getUnoShapeOf( *this );
 }
-// 
-
+
+OUnoObject& OUnoObject::operator=(const OUnoObject& rObj)
+{
+if( this == &rObj )
+return *this;
+SdrUnoObj::operator=(rObj);
+
+Reference 
xSource(const_cast(rObj).getUnoShape(), uno::UNO_QUERY);
+Reference xDest(getUnoShape(), uno::UNO_QUERY);
+if ( xSource.is() && xDest.is() )
+comphelper::copyProperties(xSource.get(), xDest.get());
+
+return *this;
+}
+
 OUnoObject* OUnoObject::Clone() const
 {
-OUnoObject* pClone = CloneHelper< OUnoObject >();
-if ( pClone )
-{
-Reference 
xSource(const_cast(this)->getUnoShape(),uno::UNO_QUERY);
-Reference xDest(pClone->getUnoShape(),uno::UNO_QUERY);
-if ( xSource.is() && xDest.is() )
-comphelper::copyProperties(xSource.get(),xDest.get());
-}
-return pClone;
+return CloneHelper< OUnoObject >();
 }
 //
 // OOle2Obj
@@ -1154,22 +1160,32 @@ uno::Reference< chart2::data::XDatabaseDataProvider > 
lcl_getDataProvider(const
 }
 return xSource;
 }
-// 
-
-// Clone() soll eine komplette Kopie des Objektes erzeugen.
-OOle2Obj* OOle2Obj::Clone() const
+
+OOle2Obj& OOle2Obj::operator=(const OOle2Obj& rObj)
 {
-OOle2Obj* pObj = CloneHelper< OOle2Obj >();
-OReportModel* pRptModel = static_cast(GetModel());
-svt::EmbeddedObjectRef::TryRunningState( pObj->GetObjRef() );
-
pObj->impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get());
+if( this == &rObj )
+return *this;
+SdrOle2Obj::operator=(rObj);
 
-uno::Reference< chart2::data::XDatabaseDataProvider > xSource( 
lcl_getDataProvider(GetObjRef()) );
-uno::Reference< chart2::data::XDatabaseDataProvider > xDest( 
lcl_getDataProvider(pObj->GetObjRef()) );
+OReportModel* pRptModel = static_cast(rObj.GetModel());
+svt::EmbeddedObjectRef::TryRunningState( GetObjRef() );
+impl_createDataProvider_nothrow(pRptModel->getReportDefinition().get());
+
+uno::Reference< chart2::data::XDatabaseDataProvider > xSource( 
lcl_getDataProvider(rObj.GetObjRef()) );
+uno::Reference< chart2::data::XDatabaseDataProvider > xDest( 
lcl_getDataProvider(GetObjRef()) );
 if ( xSource.is() && xDest.is() )
 comphelper::copyProperties(xSource.get(),xDest.get());
 
-pObj->initializeChart(pRptModel->getReportDefinition().get());
-return pObj;
+initializeChart(pRptModel->getReportDefinition().get());
+
+return *this;
+}
+
+// 
-
+// Clone() soll eine komplette Kopie des Objektes erzeugen.
+OOle2Obj* OOle2Obj::Clone() const
+{
+return CloneHelper< OOle2Obj >();
 }
 // 
-
 void OOle2Obj::impl_createDataProvider_nothrow(const uno::Reference< 
frame::XModel>& _xModel)
commit cbb2b42f113e29609161d8bdbeb667a2164a4d1a
Author: Caolán McNamara 
Date:   Fri Nov 25 16:30:15 2011 +

ByteString->rtl::OString

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 2dfe2bb..ad245a7 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -503,7 +503,7 @@ sal_Bool

[Libreoffice-commits] .: automation/source basic/inc basic/source

2011-11-25 Thread Caolán McNamara 
 automation/source/app/testbasi.cxx |2 +-
 automation/source/app/testbasi.hxx |2 +-
 basic/inc/basic/mybasic.hxx|2 +-
 basic/source/app/mybasic.cxx   |4 ++--
 basic/source/app/textedit.cxx  |   28 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 7e9eda006be9a1af14a8e8a6cb4a20cf2171de13
Author: mikew 
Date:   Fri Nov 25 10:22:17 2011 -0800

Fixed spelling: Spechial -> Special

diff --git a/automation/source/app/testbasi.cxx 
b/automation/source/app/testbasi.cxx
index 87ecf3e..c7a28d6 100644
--- a/automation/source/app/testbasi.cxx
+++ b/automation/source/app/testbasi.cxx
@@ -114,7 +114,7 @@ sal_Bool TTBasic::Compile( SbModule* p )
 return MyBasic::Compile( p );
 }
 
-const String TTBasic::GetSpechialErrorText()
+const String TTBasic::GetSpecialErrorText()
 {
 String nErrorText;
 if ( pTestObject && IS_ERROR() && GetErrorCode() == GET_ERROR()->nError )
diff --git a/automation/source/app/testbasi.hxx 
b/automation/source/app/testbasi.hxx
index c21f2d5..4f90d07 100644
--- a/automation/source/app/testbasi.hxx
+++ b/automation/source/app/testbasi.hxx
@@ -55,7 +55,7 @@ public:
 
 void LoadIniFile();
 SbTextType GetSymbolType( const String &Symbol, sal_Bool bWasTTControl );
-virtual const String GetSpechialErrorText();
+virtual const String GetSpecialErrorText();
 virtual void ReportRuntimeError( AppBasEd *pEditWin );
 virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
 };
diff --git a/basic/inc/basic/mybasic.hxx b/basic/inc/basic/mybasic.hxx
index ad7df51..aae5fd7 100644
--- a/basic/inc/basic/mybasic.hxx
+++ b/basic/inc/basic/mybasic.hxx
@@ -89,7 +89,7 @@ public:
 
 // Determines the extended symbol type for syntax highlighting
 virtual SbTextType GetSymbolType( const String &Symbol, sal_Bool 
bWasTTControl );
-virtual const String GetSpechialErrorText();
+virtual const String GetSpecialErrorText();
 virtual void ReportRuntimeError( AppBasEd *pEditWin );
 virtual void DebugFindNoErrors( sal_Bool bDebugFindNoErrors );
 
diff --git a/basic/source/app/mybasic.cxx b/basic/source/app/mybasic.cxx
index 61a2c81..b3f6409 100644
--- a/basic/source/app/mybasic.cxx
+++ b/basic/source/app/mybasic.cxx
@@ -222,7 +222,7 @@ sal_Bool MyBasic::ErrorHdl()
 void MyBasic::ReportRuntimeError( AppBasEd *pEditWin )
 {
 String nErrorText;
-nErrorText = GetSpechialErrorText();
+nErrorText = GetSpecialErrorText();
 
 if ( pEditWin ) // just in case the focus is not right
 pEditWin->ToTop();
@@ -237,7 +237,7 @@ void MyBasic::DebugFindNoErrors( sal_Bool 
bDebugFindNoErrors )
 (void) bDebugFindNoErrors; /* avoid warning about unused parameter */
 }
 
-const String MyBasic::GetSpechialErrorText()
+const String MyBasic::GetSpecialErrorText()
 {
 return GetErrorText();
 }
diff --git a/basic/source/app/textedit.cxx b/basic/source/app/textedit.cxx
index 2cfed14..23205c5 100644
--- a/basic/source/app/textedit.cxx
+++ b/basic/source/app/textedit.cxx
@@ -148,44 +148,44 @@ void TextEditImp::Notify( SfxBroadcaster& rBC, const 
SfxHint& rHint )
 }
 }
 
-#define TEXTATTR_SPECHIAL   55
-class TextAttribSpechial : public TextAttrib
+#define TEXTATTR_SPECIAL   55
+class TextAttribSpecial : public TextAttrib
 {
 private:
 FontWeight  maFontWeight;
 
 public:
-TextAttribSpechial( const FontWeight& rFontWeight );
-TextAttribSpechial( const TextAttribSpechial& rAttr );
-~TextAttribSpechial() {;}
+TextAttribSpecial( const FontWeight& rFontWeight );
+TextAttribSpecial( const TextAttribSpecial& rAttr );
+~TextAttribSpecial() {;}
 
 virtual voidSetFont( Font& rFont ) const;
 virtual TextAttrib* Clone() const;
 virtual int operator==( const TextAttrib& rAttr ) const;
 };
 
-TextAttribSpechial::TextAttribSpechial( const FontWeight& rFontWeight )
-: TextAttrib( TEXTATTR_SPECHIAL ), maFontWeight( rFontWeight )
+TextAttribSpecial::TextAttribSpecial( const FontWeight& rFontWeight )
+: TextAttrib( TEXTATTR_SPECIAL ), maFontWeight( rFontWeight )
 {}
 
-TextAttribSpechial::TextAttribSpechial( const TextAttribSpechial& rAttr )
+TextAttribSpecial::TextAttribSpecial( const TextAttribSpecial& rAttr )
 : TextAttrib( rAttr ), maFontWeight( rAttr.maFontWeight )
 {}
 
-void TextAttribSpechial::SetFont( Font& rFont ) const
+void TextAttribSpecial::SetFont( Font& rFont ) const
 {
 rFont.SetWeight( maFontWeight );
 }
 
-TextAttrib* TextAttribSpechial::Clone() const
+TextAttrib* TextAttribSpecial::Clone() const
 {
-return new TextAttribSpechial( *this );
+return new TextAttribSpecial( *this );
 }
 
-int TextAttribSpechial::operator==( const TextAttrib& rAttr ) const
+int TextAttribSpecial::operator==( const TextAttrib& rAttr ) const
 {
 return ( ( TextAttrib::operator==(rAttr ) ) &&
-( maFontWeight == ((const 
TextAttribSpechial&)rAttr).maFontWeight ) );
+( maFon

[Libreoffice-commits] .: tools/source

2011-11-25 Thread Caolán McNamara 
 tools/source/stream/strmunx.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3fc07bb4f16076acdb3deff19b7435d14edce1ff
Author: Caolán McNamara 
Date:   Fri Nov 25 20:51:38 2011 +

typo, thanks Guest70165 :-)

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index ad245a7..81a33c7 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -503,7 +503,7 @@ sal_Bool SvFileStream::LockRange( sal_Size nByteOffset, 
sal_Size nBytes )
 {
 #if OSL_DEBUG_LEVEL > 1
 fprintf( stderr, "InternalLock on %s [ %ld ... %ld ] failed\n",
- rtl::OUStringToOStroug(aFilename, 
osl_getThreadTextEncoding()).getStr(), nByteOffset, nByteOffset+nBytes );
+ rtl::OUStringToOString(aFilename, 
osl_getThreadTextEncoding()).getStr(), nByteOffset, nByteOffset+nBytes );
 #endif
 return sal_False;
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/unx

2011-11-25 Thread Julien Nabet 
 vcl/unx/kde4/KDEXLib.hxx   |2 -
 vcl/unx/kde4/warning_guard_qhash.h |   54 +
 2 files changed, 55 insertions(+), 1 deletion(-)

New commits:
commit d2911992d9d46be3906923d3d334210aab76770f
Author: Julien Nabet 
Date:   Fri Nov 25 22:21:05 2011 +0100

Fix the WaE "shadows a global declaration"

error: declaration of ‘pointer’ shadows a global declaration 
[-Werror=shadow] /usr/include/qt4/QtCore/qscopedpointer.h:83:47

diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 497a97f..9297be5 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -32,7 +32,7 @@
 
 #include 
 
-#include 
+#include "warning_guard_qhash.h"
 #include 
 #include 
 
diff --git a/vcl/unx/kde4/warning_guard_qhash.h 
b/vcl/unx/kde4/warning_guard_qhash.h
new file mode 100644
index 000..c5bf403
--- /dev/null
+++ b/vcl/unx/kde4/warning_guard_qhash.h
@@ -0,0 +1,54 @@
+/* -*- 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 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.
+ *
+ * Major Contributor(s):
+ * [ Copyright (C) 2011 Eike Rathke  (initial developer) ]
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * 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.
+ */
+
+#ifndef INCLUDED_WARNINGS_GUARD_QHASH_H
+#define INCLUDED_WARNINGS_GUARD_QHASH_H
+
+// Because the GCC system_header mechanism doesn't work in .c/.cxx compilation
+// units and more important affects the rest of the current include file, the
+// warnings guard is separated into this header file on its own.
+
+/*
+Silence down this WaE:
+/usr/include/qt4/QtCore/qscopedpointer.h:83:47: error: declaration of 
‘pointer’
+shadows a global declaration [-Werror=shadow]
+*/
+
+#ifdef _MSC_VER
+#pragma warning(push, 1)
+#elif defined __GNUC__
+#pragma GCC system_header
+#endif
+#include 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif // INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
+
+/* 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] .: vcl/unx

2011-11-25 Thread Julien Nabet 
 vcl/unx/kde4/warning_guard_qhash.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 802f27974991a47324f3ba976d048c3e9db5a263
Author: Julien Nabet 
Date:   Fri Nov 25 22:41:59 2011 +0100

Fix comment since I had copied from warnings_guard_ne_locks

diff --git a/vcl/unx/kde4/warning_guard_qhash.h 
b/vcl/unx/kde4/warning_guard_qhash.h
index c5bf403..e5c8c37 100644
--- a/vcl/unx/kde4/warning_guard_qhash.h
+++ b/vcl/unx/kde4/warning_guard_qhash.h
@@ -49,6 +49,6 @@
 #pragma warning(pop)
 #endif
 
-#endif // INCLUDED_WARNINGS_GUARD_NE_LOCKS_H
+#endif // INCLUDED_WARNINGS_GUARD_QHASH_H
 
 /* 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] .: 4 commits - jvmfwk/plugins jvmfwk/prj postprocess/prj sal/inc shell/source tail_build/prj

2011-11-25 Thread Tor Lillqvist 
 jvmfwk/plugins/sunmajor/pluginlib/makefile.mk |2 +-
 jvmfwk/prj/d.lst  |1 +
 postprocess/prj/build.lst |2 +-
 sal/inc/sal/main.h|7 ---
 shell/source/backends/desktopbe/makefile.mk   |2 +-
 shell/source/backends/localebe/makefile.mk|2 +-
 shell/source/cmdmail/makefile.mk  |5 +
 shell/source/unix/exec/makefile.mk|5 +
 shell/source/unix/misc/makefile.mk|5 +
 shell/source/unix/sysshell/makefile.mk|5 +
 tail_build/prj/build.lst  |2 +-
 11 files changed, 26 insertions(+), 12 deletions(-)

New commits:
commit 591191038e9d3847b258ab467182497e736d2cfb
Author: Tor Lillqvist 
Date:   Fri Nov 25 23:58:22 2011 +0200

Use ENFORCEDSHLPREFIX for Android

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk 
b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
index 27dc8da..78f1457 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/makefile.mk
@@ -60,7 +60,7 @@ LIB1OBJFILES= $(SLOFILES)
 
 LIB1TARGET=$(SLB)$/$(UNOCOMPONENT1).lib
 
-SHL1TARGET=$(UNOCOMPONENT1)  
+SHL1TARGET=$(ENFORCEDSHLPREFIX)$(UNOCOMPONENT1)  
 
 
 SHL1STDLIBS= \
diff --git a/jvmfwk/prj/d.lst b/jvmfwk/prj/d.lst
index 09bc295..e8753d1 100644
--- a/jvmfwk/prj/d.lst
+++ b/jvmfwk/prj/d.lst
@@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\jvmfwk
 ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin\*
 ..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin\*
 ..\%__SRC%\lib\sunjavaplugin*.so %_DEST%\lib\*
+..\%__SRC%\lib\libsunjavaplugin*.so %_DEST%\lib\*
 ..\%__SRC%\lib\sunjavaplugin*.dylib %_DEST%\lib\*
 ..\%__SRC%\class\JREProperties.class  %_DEST%\bin\JREProperties.class
 ..\%__SRC%\class\JREProperties.class  %_DEST%\lib\JREProperties.class
commit ce5f65f335096a8e2200a47cee19c36ca1507e41
Author: Tor Lillqvist 
Date:   Fri Nov 25 23:55:29 2011 +0200

Build fpicker for DESKTOP only

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index eb6513d..b8eb41e 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po  postprocess ::  accessibility BINFILTER:binfilter configmgr 
CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm 
DESKTOP:extensions extras fpicker HELP:helpcontent2 io LIBRSVG:librsvg 
lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 
DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards 
MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo 
DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder 
LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver 
STLPORT:stlport LIBXSLT:libxslt tail_build NULL
+po  postprocess ::  accessibility BINFILTER:binfilter configmgr 
CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm 
DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg 
lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 
DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards 
MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo 
DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder 
LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver 
STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po postprocess usr1-   all 
po_mkout NULL
 po postprocess\checkxmlnmake   -   all po_checkxml NULL
 po postprocess\packconfig  nmake   -   all po_packconfig 
po_checkxml NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 2235197..72e90b4 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb  tail_build : APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl 
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf 
avmedia basegfx basic bridges canvas comphelper configmgr connectivity 
cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg 
oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 
solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi 
unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb  tail_build : APACHE_COMMONS:apache-commons BSH:beanshell 
BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBXML2:libxml2 
LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd 
LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl 
PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf 
avmedia baseg

[Libreoffice-commits] .: scp2/source setup_native/source

2011-11-25 Thread Andras Timar 
 scp2/source/ooo/common_brand.scp|   20 +
 scp2/source/ooo/file_ooo.scp|   36 +
 scp2/source/ooo/module_ooo.scp  |   48 +++-
 scp2/source/ooo/module_ooo.ulf  |   24 ++
 setup_native/source/packinfo/packinfo_office.txt|   64 
 setup_native/source/packinfo/spellchecker_selection.txt |4 +
 6 files changed, 194 insertions(+), 2 deletions(-)

New commits:
commit 2e366cbdedd542e2324684f4b8b2517dbfcd7f59
Author: Andras Timar 
Date:   Fri Nov 25 23:24:18 2011 +0100

add Belarusian, Greek, Scottish Gaelic, and Telugu dictionaries

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 791eb6d..203f148 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -202,6 +202,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Ar
 DosName = "dict-ar";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Be
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-be";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Bg
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-bg";
@@ -242,6 +247,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_En
 DosName = "dict-en";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_El
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-el";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Es
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-es";
@@ -257,6 +267,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Fr
 DosName = "dict-fr";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Gd
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-gd";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Gl
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-gl";
@@ -377,6 +392,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Sw
 DosName = "dict-sw";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Te
+ParentID = gid_Brand_Dir_Share_Extensions;
+DosName = "dict-te";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Th
 ParentID = gid_Brand_Dir_Share_Extensions;
 DosName = "dict-th";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b53c69d..adce11d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1304,6 +1304,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Be
+   Dir = gid_Brand_Dir_Share_Extensions_Dict_Be;
+   Name = "dict-be.oxt";
+   Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+   UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Bg
Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg;
Name = "dict-bg.oxt";
@@ -1376,6 +1385,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_El
+   Dir = gid_Brand_Dir_Share_Extensions_Dict_El;
+   Name = "dict-el.oxt";
+   Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+   UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Es
Dir = gid_Brand_Dir_Share_Extensions_Dict_Es;
Name = "dict-es.oxt";
@@ -1403,6 +1421,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Gd
+   Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd;
+   Name = "dict-gd.oxt";
+   Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+   UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Gl
Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
Name = "dict-gl.oxt";
@@ -1619,6 +1646,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Te
+   Dir = gid_Brand_Dir_Share_Extensions_Dict_Te;
+   Name = "dict-te.oxt";
+   Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+   UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Th
Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
Name = "dict-th.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 8afa37d..473a026 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -78,11 +78,22 @@ Module gid_Module_Root_Extension_Dictionary_Ar
 Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Be
+MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BE );
+Files = (gid_File_Extension_Dictionary_Be);
+InstallOrder = "2000";
+Sortkey = "512";
+Spellcheckerlanguage = "be";
+PackageInfo = "packinfo_office.txt";
+ParentID = gid_Module_Dictionaries;
+Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Bg
 MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BG );
 Files = (gid_File_Extension_Dict

[Libreoffice-commits] .: 5 commits - cpputools/source jvmaccess/source jvmaccess/util README.cross solenv/gbuild

2011-11-25 Thread Tor Lillqvist 
 README.cross   |4 ++--
 cpputools/source/registercomponent/makefile.mk |5 +
 cpputools/source/regsingleton/makefile.mk  |5 +
 cpputools/source/unoexe/makefile.mk|4 
 jvmaccess/source/makefile.mk   |5 +
 jvmaccess/util/makefile.mk |5 +
 solenv/gbuild/Package.mk   |2 +-
 7 files changed, 27 insertions(+), 3 deletions(-)

New commits:
commit 0b4a9bd2b49da8441d873a52ae5ec2c86937c839
Author: Tor Lillqvist 
Date:   Sat Nov 26 00:32:31 2011 +0200

Compile as Objective-C++ for iOS thanks to current sal/main.h idea

diff --git a/cpputools/source/unoexe/makefile.mk 
b/cpputools/source/unoexe/makefile.mk
index 5869f18..e4317b0 100755
--- a/cpputools/source/unoexe/makefile.mk
+++ b/cpputools/source/unoexe/makefile.mk
@@ -72,6 +72,10 @@ APP1TARGET=$(TARGET)
 APP1OBJS=$(DEPOBJFILES)  
 APP1RPATH=UREBIN
 
+.IF "$(OS)" == "IOS"
+CFLAGSCXX += $(OBJCXXFLAGS)
+.ENDIF
+
 # Include all relevant (see ure/source/README) dynamic libraries, so that C++
 # UNO components running in the uno executable have a defined environment
 # (stlport, unxlngi6 libstdc++.so.6, and wntmsci10 uwinapi.dll are already
commit 649f45fdcd0bb01e087bfd1ab1056b9b02c7b7af
Author: Tor Lillqvist 
Date:   Sat Nov 26 00:30:40 2011 +0200

No sense building these for iOS

diff --git a/cpputools/source/registercomponent/makefile.mk 
b/cpputools/source/registercomponent/makefile.mk
index 6808e0b..536d864 100644
--- a/cpputools/source/registercomponent/makefile.mk
+++ b/cpputools/source/registercomponent/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Settings -
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
diff --git a/cpputools/source/regsingleton/makefile.mk 
b/cpputools/source/regsingleton/makefile.mk
index e90b0c8..9d8812c 100644
--- a/cpputools/source/regsingleton/makefile.mk
+++ b/cpputools/source/regsingleton/makefile.mk
@@ -35,6 +35,11 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
 UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb 
 UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
 
commit 177fd47a8c77848c00632398ec233464cb8575e2
Author: Tor Lillqvist 
Date:   Sat Nov 26 00:28:49 2011 +0200

Don't bother building anything here for iOS

diff --git a/jvmaccess/source/makefile.mk b/jvmaccess/source/makefile.mk
index 44e0313..8c19c93 100644
--- a/jvmaccess/source/makefile.mk
+++ b/jvmaccess/source/makefile.mk
@@ -33,6 +33,11 @@ ENABLE_EXCEPTIONS = TRUE
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
 SLOFILES = \
 $(SLO)$/classpath.obj \
 $(SLO)$/unovirtualmachine.obj \
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk
index 1d6106f..9553973 100644
--- a/jvmaccess/util/makefile.mk
+++ b/jvmaccess/util/makefile.mk
@@ -37,6 +37,11 @@ UNIXVERSIONNAMES = UDK
 
 .INCLUDE: settings.mk
 
+.IF "$(OS)" == "IOS"
+ALL:
+@echo Nothing done for $(OS)
+.ENDIF
+
 .IF "$(UNIXVERSIONNAMES)" == ""
 SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID)
 .ELSE # UNIXVERSIONNAMES
commit a5cdc4cbc70f479f0c06ec6f36d6a9139484bb34
Author: Tor Lillqvist 
Date:   Fri Nov 25 18:04:19 2011 +0200

xargs on MacOSX seems a bit broken, work around that

diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 7420757..0179dd1 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -45,7 +45,7 @@ endef
 $(call gb_Package_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PKG,2)
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
-   && cat $${RESPONSEFILE} | xargs rm -f \
+   && cat $${RESPONSEFILE} | xargs $(if $(filter 
MACOSX,$(OS_FOR_BUILD)),-n 1000) rm -f \
&& rm -f $${RESPONSEFILE}
 
 $(call gb_Package_get_preparation_target,%) :
commit fad4076a20242c94f9887984e431118a8e6aec89
Author: Tor Lillqvist 
Date:   Fri Nov 25 15:18:19 2011 +0200

Use the 5.0 SDK for the iOS simulator example

diff --git a/README.cross b/README.cross
index 6918ec6..204b86d 100644
--- a/README.cross
+++ b/README.cross
@@ -291,8 +291,8 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 
-mmacosx-version-min=10.4
 --without-myspell-dicts
 
 And here for the iOS simulator:
-CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ 
-arch i386 -isysroot 
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
-CC=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/gcc 
-arch i386 -isysroot 
/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator4.3.sdk
+CXX=ccache /Developer/Platforms/iPhoneSimulator.platform/Developer/usr/bin/g++ 
-arch i386 -isysroot 
/Develo

[Libreoffice-commits] .: solenv/gbuild

2011-11-25 Thread Bjoern Michaelsen 
 solenv/gbuild/platform/unxgcc.mk |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 3d37661a095c8d0a2a4376a859fa73c99a45ca56
Author: Bjoern Michaelsen 
Date:   Sat Nov 26 01:54:14 2011 +0100

dont attach, start own instance as otherwise it might be blocked 
via/proc/sys/kernel/yama/ptrace_scope

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9d07c9f..c5c0324 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -401,11 +401,10 @@ endef
 
 define gb_Module_DEBUGRUNCOMMAND
 OFFICESCRIPT=`mktemp` && \
-echo ". $(OUTDIR)/installation/opt/program/ooenv" > $${OFFICESCRIPT} && \
-echo "$(OUTDIR)/installation/opt/program/soffice.bin --norestore --nologo 
\"--accept=pipe,name=$(USER);urp;\" 
-env:UserInstallation=file://$(OUTDIR)/installation/ &" >> $${OFFICESCRIPT} && \
-echo "OFFICEPID=\$$!" >> $${OFFICESCRIPT} && \
-echo "echo \"office started as \$${OFFICEPID}\"" >> $${OFFICESCRIPT} && \
-echo "gdb -ex \"at \$${OFFICEPID}\" -ex \"c\"" >> $${OFFICESCRIPT} && \
+printf ". $(OUTDIR)/installation/opt/program/ooenv\\n" > $${OFFICESCRIPT} && \
+printf "gdb $(OUTDIR)/installation/opt/program/soffice.bin" >> 
$${OFFICESCRIPT} && \
+printf " -ex \"set args --norestore --nologo 
\\\"--accept=pipe,name=$(USER);urp;\\\" 
-env:UserInstallation=file://$(OUTDIR)/installation/\"" >> $${OFFICESCRIPT} && \
+printf " -ex \"r\"\\n" >> $${OFFICESCRIPT} && \
 $(SHELL) $${OFFICESCRIPT} && \
 rm $${OFFICESCRIPT}
 endef
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sw/source

2011-11-25 Thread August Sodora 
 sw/source/ui/inc/tmplctrl.hxx  |1 -
 sw/source/ui/uno/swdetect.hxx  |1 -
 sw/source/ui/uno/unodoc.cxx|1 -
 sw/source/ui/vba/vbasystem.cxx |3 +--
 4 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 7d20dff1031b3c5325c09c541183131bdc15db57
Author: August Sodora 
Date:   Thu Nov 24 02:40:12 2011 -0500

Remove unnecessary tools/string includes

diff --git a/sw/source/ui/inc/tmplctrl.hxx b/sw/source/ui/inc/tmplctrl.hxx
index f0579d0..cc48a14 100644
--- a/sw/source/ui/inc/tmplctrl.hxx
+++ b/sw/source/ui/inc/tmplctrl.hxx
@@ -30,7 +30,6 @@
 
 // include ---
 #include 
-#include 
 
 // class BookmarkToolBoxControl ---
 class SwTemplateControl : public SfxStatusBarControl
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index 124a443..1c72939 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class SfxMedium;
 
diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx
index e85dfea..1b2d1fa 100644
--- a/sw/source/ui/uno/unodoc.cxx
+++ b/sw/source/ui/uno/unodoc.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_sw.hxx"
 // System - Includes -
 
-#include 
 #include 
 #include 
 #include "swdll.hxx"
diff --git a/sw/source/ui/vba/vbasystem.cxx b/sw/source/ui/vba/vbasystem.cxx
index 4b5b5a6..d8be0e2 100644
--- a/sw/source/ui/vba/vbasystem.cxx
+++ b/sw/source/ui/vba/vbasystem.cxx
@@ -26,11 +26,10 @@
  *
  /
 #include "vbasystem.hxx"
-#include 
+
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-11-25 Thread August Sodora 
 basic/source/comp/symtbl.cxx |2 +-
 basic/source/inc/symtbl.hxx  |4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 0e8fd29c3139284fda47d6ea25b5661955ef
Author: August Sodora 
Date:   Sat Nov 26 00:06:05 2011 -0500

Change boost::ptr_vector to std::vector

diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index c81a1f3..1aaeca4 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -75,7 +75,7 @@ short SbiStringPool::Add( const rtl::OUString& rVal, sal_Bool 
bNoCase )
 return i+1;
 }
 
-aData.push_back(new rtl::OUString(rVal));
+aData.push_back(rVal);
 return (short) ++n;
 }
 
diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index 33da527..efdc704 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -29,8 +29,6 @@
 #ifndef _SYMTBL_HXX
 #define _SYMTBL_HXX
 
-#include 
-
 class SbiConstDef;
 class SbiParser;
 class SbiProcDef;
@@ -44,7 +42,7 @@ enum SbiSymScope { SbLOCAL, SbPARAM, SbPUBLIC, SbGLOBAL, 
SbRTL };
 
 class SbiStringPool {
 const rtl::OUString aEmpty;
-boost::ptr_vector aData;
+std::vector aData;
 SbiParser* pParser;
 public:
 SbiStringPool( SbiParser* );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basic/source

2011-11-25 Thread August Sodora 
 basic/source/inc/symtbl.hxx |   54 ++--
 1 file changed, 27 insertions(+), 27 deletions(-)

New commits:
commit 2de121e58879d511376dd725aa41e2f842f30c43
Author: August Sodora 
Date:   Sat Nov 26 00:16:58 2011 -0500

sal_Bool->bool

diff --git a/basic/source/inc/symtbl.hxx b/basic/source/inc/symtbl.hxx
index efdc704..310a238 100644
--- a/basic/source/inc/symtbl.hxx
+++ b/basic/source/inc/symtbl.hxx
@@ -111,16 +111,16 @@ protected:
 sal_uInt16 nProcId;
 sal_uInt16 nPos;
 sal_uInt32 nChain;
-sal_Bool   bNew : 1;// sal_True: Dim As New...
-sal_Bool   bChained : 1;// sal_True: symbol is defined in code
-sal_Bool   bByVal   : 1;// sal_True: ByVal-parameter
-sal_Bool   bOpt : 1;// sal_True: optional parameter
-sal_Bool   bStatic  : 1;// sal_True: STATIC variable
-sal_Bool   bAs  : 1;// sal_True: data type defined per AS 
XXX
-sal_Bool   bGlobal  : 1;// sal_True: global variable
-sal_Bool   bParamArray : 1; // sal_True: ParamArray parameter
-sal_Bool   bWithEvents : 1; // sal_True: Declared WithEvents
-sal_Bool   bWithBrackets : 1;   // sal_True: Followed by ()
+bool   bNew : 1;// true: Dim As New...
+bool   bChained : 1;// true: symbol is defined in code
+bool   bByVal   : 1;// true: ByVal-parameter
+bool   bOpt : 1;// true: optional parameter
+bool   bStatic  : 1;// true: STATIC variable
+bool   bAs  : 1;// true: data type defined per AS XXX
+bool   bGlobal  : 1;// true: global variable
+bool   bParamArray : 1; // true: ParamArray parameter
+bool   bWithEvents : 1; // true: Declared WithEvents
+bool   bWithBrackets : 1;   // true: Followed by ()
 sal_uInt16 nDefaultId;  // Symbol number of default value
 short  nFixedStringLength;  // String length in: Dim foo As 
String*Length
 public:
@@ -143,28 +143,28 @@ public:
 short  GetLen() const   { return nLen;  }
 void   SetDims( short n ) { nDims = n;  }
 short  GetDims() const  { return nDims; }
-sal_Bool   IsDefined() const{ return bChained;  }
-void   SetOptional(){ bOpt = sal_True;  }
-void   SetParamArray()  { bParamArray = sal_True;   }
-void   SetWithEvents()  { bWithEvents = sal_True;   }
-void   SetWithBrackets(){ bWithBrackets = sal_True; }
-void   SetByVal( sal_Bool bByVal_ = sal_True )
+bool   IsDefined() const{ return bChained;  }
+void   SetOptional(){ bOpt = true;  }
+void   SetParamArray()  { bParamArray = true;   }
+void   SetWithEvents()  { bWithEvents = true;   }
+void   SetWithBrackets(){ bWithBrackets = true; }
+void   SetByVal( bool bByVal_ = true )
 { bByVal = bByVal_; }
-void   SetStatic( sal_Bool bAsStatic = sal_True )   { bStatic = 
bAsStatic;  }
+void   SetStatic( bool bAsStatic = true )  { bStatic = bAsStatic;  
}
 void   SetNew() { bNew = sal_True;  }
 void   SetDefinedAs()   { bAs = sal_True;   }
-void   SetGlobal(sal_Bool b){ bGlobal = b;  }
+void   SetGlobal(bool b){ bGlobal = b;  }
 void   SetDefaultId( sal_uInt16 n ) { nDefaultId = n; }
 sal_uInt16 GetDefaultId( void ) { return nDefaultId; }
-sal_Bool   IsOptional() const{ return bOpt; }
-sal_Bool   IsParamArray() const{ return bParamArray; }
-sal_Bool   IsWithEvents() const{ return bWithEvents; }
-sal_Bool   IsWithBrackets() const{ return bWithBrackets; }
-sal_Bool   IsByVal() const  { return bByVal;}
-sal_Bool   IsStatic() const { return bStatic;   }
-sal_Bool   IsNew() const{ return bNew;  }
-sal_Bool   IsDefinedAs() const { return bAs;}
-sal_Bool   IsGlobal() const { return bGlobal;   }
+bool   IsOptional() const{ return bOpt; }
+bool   IsParamArray() const{ return bParamArray; }
+bool   IsWithEvents() const{ return bWithEvents; }
+bool   IsWithBrackets() const{ return bWithBrackets; }
+bool   IsByVal() const  { return bByVal;}
+bool   IsStatic() const { return bStatic;   }
+bool   IsNew() const{ return bNew;  }
+bool   IsDefinedAs() const { return bAs;}
+bool   IsGlobal() const { return bGlobal;   }
 short  GetFixedStringLength( void ) const { return nFixedStringLength; 
}
 void   SetFixedStringLength( short n ) { nFixedStringLength = n; }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreo

[Libreoffice-commits] .: 6 commits - offapi/com sc/source

2011-11-25 Thread Markus Mohrhard 
 offapi/com/sun/star/sheet/XSpreadsheets2.idl |8 +--
 sc/source/core/data/cell.cxx |8 +--
 sc/source/ui/namedlg/namedefdlg.cxx  |2 
 sc/source/ui/namedlg/namedlg.cxx |   21 ++
 sc/source/ui/namedlg/namemgrtable.cxx|7 ++-
 sc/source/ui/src/namedefdlg.src  |   56 +--
 sc/source/ui/src/namedlg.src |   50 
 7 files changed, 73 insertions(+), 79 deletions(-)

New commits:
commit 8039cd4d7db58921f7d35eeea93cd7f85a5e0815
Author: Markus Mohrhard 
Date:   Sat Nov 26 06:26:03 2011 +0100

ManageNames: improve layout of Define Names dialog

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index f7afe22..c4ffc2e 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -322,7 +322,7 @@ void ScNameDefDlg::MorePushed()
 Size nSize = GetSizePixel();
 
 //depending on the state of the button, move all elements below up/down
-long nPixel = 85;
+long nPixel = 75;
 if (!maBtnMore.GetState())
 {
 nPixel *= -1;
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 67f7b43..1896918 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -40,89 +40,89 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
 Closeable = TRUE;
 PushButton BTN_ADD
 {
-Pos = MAP_APPFONT( 110, 100 );
-Size = MAP_APPFONT( 40, 14 );
+Pos = MAP_APPFONT( 90, 100 );
+Size = MAP_APPFONT( 50, 15 );
 TabStop = TRUE;
 Text [en-US] = "Add";
 };
 PushButton BTN_CANCEL
 {
-Pos = MAP_APPFONT( 155, 100 );
-Size = MAP_APPFONT ( 40, 14 );
+Pos = MAP_APPFONT( 145, 100 );
+Size = MAP_APPFONT ( 50, 15 );
 TabStop = TRUE;
 Text [en-US] = "Cancel";
 };
 CheckBox BTN_MORE
 {
-Pos = MAP_APPFONT( 6, 82 );
-Size = MAP_APPFONT( 60, 14 );
+Pos = MAP_APPFONT( 5, 82 );
+Size = MAP_APPFONT( 60, 15 );
 Text [en-US] = "RangeOptions";
 };
 FixedText FT_INFO
 {
-Pos = MAP_APPFONT( 6, 6 );
-Size = MAP_APPFONT( 180, 14 );
+Pos = MAP_APPFONT( 5, 5 );
+Size = MAP_APPFONT( 180, 15 );
 };
 FixedText FT_NAME
 {
-Pos = MAP_APPFONT( 6, 25 );
-Size = MAP_APPFONT( 30, 14 );
+Pos = MAP_APPFONT( 5, 25 );
+Size = MAP_APPFONT( 30, 15 );
 Text [en-US] = "Name";
 };
 FixedText FT_RANGE
 {
-Pos = MAP_APPFONT( 6, 44 );
-Size = MAP_APPFONT( 30, 14 );
+Pos = MAP_APPFONT( 5, 45 );
+Size = MAP_APPFONT( 30, 15 );
 Text [en-US] = "Range";
 };
 FixedText FT_SCOPE
 {
-Pos = MAP_APPFONT( 6, 63 );
-Size = MAP_APPFONT( 30, 14 );
+Pos = MAP_APPFONT( 5, 65 );
+Size = MAP_APPFONT( 30, 15 );
 Text [en-US] = "Scope";
 };
 Edit ED_NAME
 {
 Border = TRUE;
 Pos = MAP_APPFONT( 40, 25 );
-Size = MAP_APPFONT( 150, 14 );
+Size = MAP_APPFONT( 155, 15 );
 TabStop = TRUE;
 };
 Edit ED_RANGE
 {
 Border = TRUE;
-Pos = MAP_APPFONT( 40, 44 );
-Size = MAP_APPFONT( 130, 14 );
+Pos = MAP_APPFONT( 40, 45 );
+Size = MAP_APPFONT( 140, 15 );
 TabStop = TRUE;
 };
 ImageButton RB_RANGE
 {
-Pos = MAP_APPFONT ( 170 , 44 ) ;
-Size = MAP_APPFONT ( 15 , 14 ) ;
+Pos = MAP_APPFONT ( 180 , 45 ) ;
+Size = MAP_APPFONT ( 15 , 15 ) ;
 TabStop = TRUE ;
 QuickHelpText [ en-US ] = "Shrink" ;
 };
 CheckBox BTN_PRINTAREA
 {
 HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA";
-Pos = MAP_APPFONT ( 6 , 100 ) ;
-Size = MAP_APPFONT ( 80 , 14 ) ;
+Pos = MAP_APPFONT ( 5 , 100 ) ;
+Size = MAP_APPFONT ( 80 , 15 ) ;
 Text [ en-US ] = "~Print range" ;
 TabStop = TRUE ;
 };
 CheckBox BTN_CRITERIA
 {
 HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA";
-Pos = MAP_APPFONT ( 6 , 118 ) ;
-Size = MAP_APPFONT ( 60 , 14 ) ;
+Pos = MAP_APPFONT ( 5 , 120 ) ;
+Size = MAP_APPFONT ( 60 , 15 ) ;
 Text [ en-US ] = "~Filter" ;
 TabStop = TRUE ;
 };
 CheckBox BTN_ROWHEADER
 {
 HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER";
-Pos = MAP_APPFONT ( 110, 118 ) ;
-Size = MAP_APPFONT ( 82 , 14 ) ;
+Pos = MAP_APPFONT ( 110, 120 ) ;
+Size = MAP_APPFONT ( 82 , 15 ) ;
 Text [ en-US ] = "Repeat ~row" ;
 TabStop = TRUE ;
 };
@@ -130,15 +130,15 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
 {
 HelpID = "sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER";
 Pos = MAP_APPFONT ( 110 , 100 ) ;
-Size = MAP_APPFONT ( 82 , 14 ) ;
+Size = MAP_

[Libreoffice-commits] .: comphelper/inc connectivity/source dbaccess/source forms/source framework/source lingucomponent/source oox/source scaddins/source sdext/source svtools/source vcl/generic xmlof

2011-11-25 Thread August Sodora 
 comphelper/inc/comphelper/string.hxx   |2 -
 connectivity/source/commontools/TIndexes.cxx   |2 -
 connectivity/source/commontools/dbtools2.cxx   |4 +--
 connectivity/source/drivers/calc/CTable.cxx|4 +--
 dbaccess/source/core/api/CacheSet.cxx  |6 ++---
 dbaccess/source/core/api/KeySet.cxx|4 +--
 dbaccess/source/ext/macromigration/migrationengine.cxx |2 -
 forms/source/xforms/convert.cxx|2 -
 framework/source/fwe/helper/configimporter.cxx |2 -
 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx |   12 
+-
 lingucomponent/source/spellcheck/spell/sspellimp.cxx   |   12 
+-
 oox/source/ole/olehelper.cxx   |2 -
 scaddins/source/datefunc/datefunc.cxx  |2 -
 sdext/source/minimizer/optimizerdialogcontrols.cxx |2 -
 svtools/source/graphic/grfcache.cxx|8 
+++---
 vcl/generic/fontmanager/fontmanager.cxx|2 -
 xmloff/source/text/txtimp.cxx  |4 +--
 17 files changed, 36 insertions(+), 36 deletions(-)

New commits:
commit 93253ee6ab355a0590e9632e2ce2f024af15c535
Author: August Sodora 
Date:   Sat Nov 26 00:48:17 2011 -0500

Remove some uses of OUString::setCharAt

diff --git a/comphelper/inc/comphelper/string.hxx 
b/comphelper/inc/comphelper/string.hxx
index 878b557..037c947 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -426,7 +426,7 @@ namespace detail
 {
 rBuffer.setLength(nLen);
 for (sal_Int32 i = nOrigLen; i < nLen; ++i)
-rBuffer.setCharAt(i, cFill);
+rBuffer[i] = cFill;
 }
 return rBuffer;
 }
diff --git a/connectivity/source/commontools/TIndexes.cxx 
b/connectivity/source/commontools/TIndexes.cxx
index 5132a9f..f319d45 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -190,7 +190,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const 
::rtl::OUString& _rForName
 }
 aSql.appendAscii(",");
 }
-aSql.setCharAt(aSql.getLength()-1,')');
+aSql[aSql.getLength() - 1] = ')';
 }
 else
 {
diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index d955ef2..2ae5c91 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -355,8 +355,8 @@ namespace
 
 if ( aSql.getLength() )
 {
-if ( aSql.charAt(aSql.getLength()-1) == ',' )
-aSql.setCharAt(aSql.getLength()-1,')');
+if ( aSql[aSql.getLength() - 1] == ',' )
+aSql[aSql.getLength() - 1] = ')';
 else
 aSql.appendAscii(")");
 }
diff --git a/connectivity/source/drivers/calc/CTable.cxx 
b/connectivity/source/drivers/calc/CTable.cxx
index cbfb9f9..ca33fa0 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -452,8 +452,8 @@ void lcl_SetValue( ORowSetValue& rValue, const 
Reference& xSheet,
 {
 ::rtl::OUStringBuffer aBuffer(2);
 aBuffer.setLength( 2 );
-aBuffer.setCharAt( 0, (sal_Unicode) ( 'A' + ( nColumn / 26 ) - 1 ) );
-aBuffer.setCharAt( 1, (sal_Unicode) ( 'A' + ( nColumn % 26 ) ) );
+aBuffer[0] = (sal_Unicode) ( 'A' + ( nColumn / 26 ) - 1 );
+aBuffer[1] = (sal_Unicode) ( 'A' + ( nColumn % 26 ) );
 return aBuffer.makeStringAndClear();
 }
 }
diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index f1e5f3e..bd31914 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -188,8 +188,8 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& 
_rInsertRow,const connecti
 aValues.append(aPara);
 }
 
-aSql.setCharAt(aSql.getLength()-1,')');
-aValues.setCharAt(aValues.getLength()-1,')');
+aSql[aSql.getLength() - 1] = ')';
+aValues[aValues.getLength() - 1] = ')';
 
 aSql.append(aValues.makeStringAndClear());
 // now create end execute the prepared statement
@@ -311,7 +311,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& 
_rInsertRow ,const ORowSetR
 ::rtl::OUStringBuffer aCondition;
 ::std::list< sal_Int32> aOrgValues;
 fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues);
-aSql.setCharAt(aSql.getLength()-1,' ');
+aSql[aSql.getLength() - 1] = ' ';
 if ( aCondition.getLength() )
 {
 aCondition.setLength(aCondition.getLength()-5);
diff --git a/dbacce