[Libreoffice-commits] .: bin/README distro-configs/README icon-themes/README icon-themes/README.txt rsc/README scaddins/README
bin/README |9 ++ distro-configs/README | 14 ++ icon-themes/README | 66 + icon-themes/README.txt | 45 - rsc/README | 38 ++-- scaddins/README|4 ++ 6 files changed, 123 insertions(+), 53 deletions(-) New commits: commit 1f63bd653cad40ec1d6aa111cc66959a93d120ce Author: Michael Meeks michael.me...@suse.com Date: Wed Feb 8 11:17:22 2012 + Add and expand more readme files for module documentation diff --git a/bin/README b/bin/README new file mode 100644 index 000..72dbdcd --- /dev/null +++ b/bin/README @@ -0,0 +1,9 @@ +Tools and scripts used during the build + +This direction has a number of key pieces that are used during the +build, or are simply generally useful. One example is + +bin/find-german-comments directory + +which will try to detect and extract all the German comments in a +given source code hireachy / directory. \ No newline at end of file diff --git a/distro-configs/README b/distro-configs/README new file mode 100644 index 000..f22328f --- /dev/null +++ b/distro-configs/README @@ -0,0 +1,14 @@ +Pre-canned distribution / platform configurations + +When the software is configured for a platform, since we run on so +many platforms, detecting the best sequence of configure options to +get it building is hard. + +Instead we have a text file containing the recommended (often the +distributed) version of these parameters, one per distribution or +significant platform. These are interpreted by autogen.sh and +eventually end up passed to configure. Thus: + +./autogen.sh --with-distro=LibreOfficeAndroid + +might build a version tweaked for Android. diff --git a/icon-themes/README b/icon-themes/README new file mode 100644 index 000..7655710 --- /dev/null +++ b/icon-themes/README @@ -0,0 +1,66 @@ +Icon repository for the applications + +All of the icons, separated by themes are included in this +directory. These icons are built into .zip files, and re-ordered / +packed for efficiency reasons based on our UI configuration by the +packimages/ module. + +An icon theme does not need to contain all images, since these can be +layered one on top of another. + +In general the layering is done like this: + +leaf theme +tango +industrial +galaxy + +The classic theme is left primarily for historical interest, rather +than intended to be packaged. + + +How to add a new image set: +--- + +- Create a directory for it here (let's call it e.g. new_set) + +- Add its images_ name to CUSTOM_IMAGE_SETS in + postprocess/packimages/pack/makefile.mk + +- Add its gid to the Files section of gid_Module_Root_Brand in + scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File entry + to scp2/source/ooo/file_ooo.scp (see for example + gid_Brand_File_ImagesCrystal_Zip) + +- Add a vcl constant for it in vcl/inc/settings.hxx, e.g. + #define STYLE_SYMBOLS_NEW_SET ((ULONG)5) + +- Map the vcl constant to its real name in +::rtl::OUString StyleSettings::GetCurrentSymbolsStyleName() const + and +ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString rName ) const + both in vcl/source/app/settings.cxx, e.g. +case STYLE_SYMBOLS_NEW_SET: return ::rtl::OUString::createFromAscii( new_set ); + and +else if ( rName == ::rtl::OUString::createFromAscii( new_set ) ) + return STYLE_SYMBOLS_NEW_SET; + +- Add localized item names to 'ListBox LB_ICONSTYLE' to +'StringList [ de ]' + and 'StringList [ en-US ]', e.g. + New set ; ; + both in cui/source/options/optgdlg.src + +- Add all known localizations of the new item to svx/source/dialog/localize.sdf, e.g. +svxsource\dialog\optgdlg.src 0 stringlist OFA_TP_VIEW.LB_ICONSTYLE6 0 cs New set 2002-02-02 02:02:02 + the check box item will not be visible in the other localizations otherwise, see http://www.openoffice.org/issues/show_bug.cgi?id=74982 + +- Add the new_set to 'SymbolsStyle' property + in officecfg/registry/schema/org/openoffice/Office/Common.xcs. + +- The default theme for various desktops (KDE, GNOME, ...) is defined in +ULONG StyleSettings::GetCurrentSymbolsStyle() const in + vcl/source/app/settings.cxx + +- The fallback for particular icons is defined in +postprocess/packimages/pack/makefile.mk diff --git a/icon-themes/README.txt b/icon-themes/README.txt deleted file mode 100644 index e6514d8..000 --- a/icon-themes/README.txt +++ /dev/null @@ -1,45 +0,0 @@ -How to add a new image set: - -- Create a directory for it here (let's call it e.g. new_set) - -- Add its images_ name to CUSTOM_IMAGE_SETS in - postprocess/packimages/pack/makefile.mk - -- Add its gid to the Files section of gid_Module_Root_Brand in - scp2/source/ooo/module_hidden_ooo.scp and add a corresponding File
[Libreoffice-commits] .: bin/README
bin/README |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 809fd00863026cdff4bf2de7d02956d39e867eeb Author: Tor Lillqvist t...@iki.fi Date: Wed Feb 8 14:07:36 2012 +0200 Surely these are mostly *not* used during the build diff --git a/bin/README b/bin/README index 72dbdcd..688d758 100644 --- a/bin/README +++ b/bin/README @@ -1,6 +1,6 @@ -Tools and scripts used during the build +Tools and scripts mostly not used during the build -This direction has a number of key pieces that are used during the +This direction has a number of key pieces (?) that are used during the build, or are simply generally useful. One example is bin/find-german-comments directory ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/source
wizards/source/importwizard/Main.xba | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) New commits: commit f3e40273b699910108007faf8a7991fe0498ad97 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 8 12:38:10 2012 + Resolves: fdo#43644 survive registered but unavailable binfilter diff --git a/wizards/source/importwizard/Main.xba b/wizards/source/importwizard/Main.xba index 8084fda..7385c6b 100644 --- a/wizards/source/importwizard/Main.xba +++ b/wizards/source/importwizard/Main.xba @@ -44,7 +44,7 @@ Sub Main() ImportDialog.ImportPreview.BackGroundColor = RGB(0,60,126) ImportDialog.cmdGoOn.DefaultButton = True ImportDialogArea.GetControl(quot;optMSDocumentsquot;).SetFocus() - oBinFilterComp = createUnoService( quot;com.sun.star.comp.office.BF_MigrateFilterquot; ) + oBinFilterComp = createBF_MigrateFilterIfPossible() ToggleCheckboxesWithBoolean(True) RetValue = ImportDialogArea.Execute() @@ -186,6 +186,17 @@ Dim i as Integer End Sub +Function createBF_MigrateFilterIfPossible() +Dim oService +On Error Goto RTError +oService = createUnoService(quot;com.sun.star.comp.office.BF_MigrateFilterquot;) +getBinFilterCompIfItExists = oService +Exit Function +RTError: +createBF_MigrateFilterIfPossible = Nothing +End Function + + Function CheckInstalledModule(Index as Integer) as Boolean Dim ModuleName as String Dim NameList() as String ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/fields/reffld.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 44f971506c0ed37928c48e55d8007f24b0c43a5f
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Wed Feb 8 14:06:09 2012 +0100
fdo#35669: Update the references even if nothing uses them here
Merge the references with the other document even if there is no field
using them as this may break the sequence and references in other parts
of a master document.
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 05c3eda..b01471a 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -1074,8 +1074,7 @@ void _RefIdsMap::Check( SwDoc rDoc, SwDoc rDestDoc,
SwGetRefField rFld,
void SwGetRefFieldType::MergeWithOtherDoc( SwDoc rDestDoc )
{
-if( rDestDoc != pDoc
-rDestDoc.GetSysFldType( RES_GETREFFLD )-GetDepends() )
+if( rDestDoc != pDoc )
{
// dann gibt es im DestDoc RefFelder, also muessen im SourceDoc
// alle RefFelder auf einduetige Ids in beiden Docs umgestellt
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/source
sc/source/filter/xml/xmlstyli.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 4078a190d3b957577bc1d96c895dcdc19f4ed263
Author: Eike Rathke er...@redhat.com
Date: Thu Jan 26 14:03:13 2012 +0100
resolved fdo#38595 border width lost in ODF import
backported 34315e7ec4062f9521cd19951b5f7f6ad9ce0d2e
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/sc/source/filter/xml/xmlstyli.cxx
b/sc/source/filter/xml/xmlstyli.cxx
index f4b7d6b..08a867f 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -173,12 +173,14 @@ void
ScXMLCellImportPropertyMapper::finished(::std::vector XMLPropertyState
pBorders[i]-maValue = aBorderLine;
if( pBorderWidths[i] )
{
+// Merge style:border-line-width values to fo:border values. Do
+// not override fo:border line width or line style with an
+// empty value!
table::BorderLine2 aBorderLineWidth;
pBorderWidths[i]-maValue = aBorderLineWidth;
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
pBorders[i]-maValue = aBorderLine;
}
}
@@ -197,7 +199,6 @@ void ScXMLCellImportPropertyMapper::finished(::std::vector
XMLPropertyState
aBorderLine.OuterLineWidth = aBorderLineWidth.OuterLineWidth;
aBorderLine.InnerLineWidth = aBorderLineWidth.InnerLineWidth;
aBorderLine.LineDistance = aBorderLineWidth.LineDistance;
-aBorderLine.LineWidth = aBorderLineWidth.LineWidth;
pDiagBorders[i]-maValue = aBorderLine;
if (pDiagBorderWidths[i])
pDiagBorderWidths[i]-mnIndex = -1;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - connectivity/source l10ntools/inc l10ntools/source svtools/source svx/source
connectivity/source/resource/conn_log_res.src |1
l10ntools/inc/cfgmerge.hxx| 14 ++-
l10ntools/inc/export.hxx |9 --
l10ntools/inc/gsicheck.hxx|8 -
l10ntools/inc/lngmerge.hxx| 12 +-
l10ntools/inc/xmlparse.hxx|7 -
l10ntools/inc/xrmmerge.hxx|6 +
l10ntools/source/cfgmerge.cxx | 45 +++---
l10ntools/source/export.cxx | 49 +++
l10ntools/source/export2.cxx | 97 --
l10ntools/source/gsicheck.cxx | 112 +-
l10ntools/source/helpmerge.cxx| 89 +++-
l10ntools/source/lngmerge.cxx | 43 +
l10ntools/source/localize.cxx | 31 +++
l10ntools/source/merge.cxx| 22 +++--
l10ntools/source/xmlparse.cxx | 48 +--
l10ntools/source/xrmlex.l |2
l10ntools/source/xrmmerge.cxx | 54 +++-
svtools/source/control/filectrl.src |1
svtools/source/misc/undo.src |1
svx/source/dialog/docrecovery.src |1
21 files changed, 224 insertions(+), 428 deletions(-)
New commits:
commit 344ebc80330cc4f6ff9858ab6d06735568b87bf9
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 8 14:34:22 2012 +0100
Freed l10ntools from tools/stream.hxx
Removed completely cases of convoluted code to remove UTF-8 BOM from files
or translate line endings. Hopefully none of this was actually necessary
(on Windows?).
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index bd0627e..6c82cc3 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -29,9 +29,13 @@
#ifndef _CFG_MERGE_HXX
#define _CFG_MERGE_HXX
-#include boost/unordered_map.hpp
+#include sal/config.h
+
+#include fstream
#include vector
+#include boost/unordered_map.hpp
+
typedef boost::unordered_maprtl::OString, rtl::OString, rtl::OStringHash
OStringHashMap;
@@ -68,7 +72,7 @@ public:
// class CfgStack
//
-typedef ::std::vector CfgStackData* CfgStackList;
+typedef std::vector CfgStackData* CfgStackList;
class CfgStack
{
@@ -89,9 +93,9 @@ public:
return temp;
}
-CfgStackData *GetStackData( size_t nPos = LIST_APPEND );
+CfgStackData *GetStackData();
-rtl::OString GetAccessPath( size_t nPos = LIST_APPEND );
+rtl::OString GetAccessPath( size_t nPos );
size_t size() const { return maList.size(); }
};
@@ -148,7 +152,7 @@ public:
class CfgOutputParser : public CfgParser
{
protected:
-SvFileStream *pOutputStream;
+std::ofstream pOutputStream;
public:
CfgOutputParser(const rtl::OString rOutputFile);
virtual ~CfgOutputParser();
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index ba086b5..52efd99 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -31,6 +31,8 @@
#include sal/config.h
+#include fstream
+
#include comphelper/string.hxx
#ifndef L10NTOOLS_DIRECTORY_HXX
@@ -38,7 +40,6 @@
#include l10ntools/directory.hxx
#endif
-#include tools/stream.hxx
#include tools/fsys.hxx
#include osl/file.hxx
#include osl/file.h
@@ -263,7 +264,7 @@ class Export
private:
WordTransformer *pWordTransformer;
-SvFileStream aOutput;
+std::ofstream aOutput;
ResStack aResStack; // stack for parsing recursive
@@ -304,8 +305,6 @@ public:
static void SetLanguages( std::vectorrtl::OString val );
static void RemoveUTF8ByteOrderMarker( rtl::OString rString );
static bool hasUTF8ByteOrderMarker( const rtl::OString rString );
-static void RemoveUTF8ByteOrderMarkerFromFile(const rtl::OString
rFilename);
-static bool fileHasUTF8ByteOrderMarker(const rtl::OString rString);
static rtl::OString QuoteHTML( rtl::OString const rString );
static bool CopyFile(const rtl::OString rSource , const rtl::OString
rDest);
@@ -321,7 +320,6 @@ public:
static void getCurrentDir( std::string dir );
static rtl::OString GetTimeStamp();
-static sal_Bool ConvertLineEnds( rtl::OString const sSource,
rtl::OString const sDestination );
static rtl::OString GetNativeFile( rtl::OString const sSource );
static DirEntry GetTempFile();
@@ -461,7 +459,6 @@ class MergeDataFile
private:
sal_Bool bErrorLog;
rtl::OString sErrorLog;
-SvFileStream aErrLog;
MergeDataHashMap aMap;
std::setrtl::OString aLanguageSet;
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index eaab600..46b3709 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -92,7 +92,7 @@ public:
typedef ::std::vector GSILine* GSIBlock_Impl;
-class LazySvFileStream;
+class LazyStream;
class GSIBlock
{
[Libreoffice-commits] .: sfx2/source
sfx2/source/dialog/alienwarn.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 09be8bbee6b49680dd2a16f5b4c2c2f8d9eca72c
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Wed Feb 8 18:48:37 2012 +1030
Fix fdo#45117 - Alien save dialog buttons run off the edge
Adjusts the width of the dialog to be wider, if required.
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index e913c88..3e99575 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -174,6 +174,10 @@ void SfxAlienWarningDialog::InitSize()
// new size of the dialog
aNewSize = GetSizePixel();
aNewSize.Height() -= nDelta;
+if (aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH aNewSize.Width())
+{
+aNewSize.Width() = aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH;
+}
SetSizePixel( aNewSize );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source
sfx2/source/dialog/alienwarn.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit cce15c38036c5d7de1405012dc448f3fb3ab3476
Author: Josh Heidenreich josh.sickm...@gmail.com
Date: Wed Feb 8 18:48:37 2012 +1030
Fix fdo#45117 - Alien save dialog buttons run off the edge
Adjusts the width of the dialog to be wider, if required.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index e913c88..3e99575 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -174,6 +174,10 @@ void SfxAlienWarningDialog::InitSize()
// new size of the dialog
aNewSize = GetSizePixel();
aNewSize.Height() -= nDelta;
+if (aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH aNewSize.Width())
+{
+aNewSize.Width() = aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH;
+}
SetSizePixel( aNewSize );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: linguistic/inc linguistic/source unusedcode.easy
linguistic/inc/linguistic/misc.hxx |6
linguistic/source/misc.cxx | 51 -
unusedcode.easy|5 ---
3 files changed, 62 deletions(-)
New commits:
commit 7e579e6f4d6fc18d36cd29743b7343f20bda500d
Author: Alexander Bergmann myadd...@gmx.de
Date: Wed Feb 8 12:29:23 2012 +0100
unusedcode.easy: Removed unused code (linguistic)
diff --git a/linguistic/inc/linguistic/misc.hxx
b/linguistic/inc/linguistic/misc.hxx
index da24159..ee41fe4 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -139,16 +139,10 @@ LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const
rtl::OUString rTxt, sal_Int3
LNG_DLLPUBLIC sal_BoolIsUpper( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int16 nLanguage );
-LNG_DLLPUBLIC sal_BoolIsLower( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int16 nLanguage );
inline sal_BoolIsUpper( const String rText, sal_Int16 nLanguage )
{ return IsUpper( rText, 0, rText.Len(), nLanguage ); }
-inline sal_BoolIsLower( const String rText, sal_Int16 nLanguage )
{ return IsLower( rText, 0, rText.Len(), nLanguage ); }
String ToLower( const String rText, sal_Int16 nLanguage );
-String ToUpper( const String rText, sal_Int16 nLanguage );
-String ToTitle( const String rText, sal_Int16 nLanguage );
-sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
-sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString rText );
LNG_DLLPUBLIC sal_Bool IsNumeric( const String rText );
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 4927b4e..59c3f37 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -635,18 +635,6 @@ sal_Bool IsUpper( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int
}
-sal_Bool IsLower( const String rText, xub_StrLen nPos, xub_StrLen nLen,
sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-sal_Int32 nFlags = rCC.getStringType( rText, nPos, nLen );
-return (nFlags KCharacterType::LOWER)
- !(nFlags KCharacterType::UPPER);
-}
-
-
String ToLower( const String rText, sal_Int16 nLanguage )
{
MutexGuard aGuard( lcl_GetCharClassMutex() );
@@ -657,45 +645,6 @@ String ToLower( const String rText, sal_Int16 nLanguage )
}
-String ToUpper( const String rText, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.uppercase( rText );
-}
-
-
-String ToTitle( const String rText, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.titlecase(rText);
-}
-
-
-sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.lowercase( rtl::OUString(cChar) )[0];
-}
-
-
-sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.uppercase( rtl::OUString(cChar) )[0];
-}
-
// sorted(!) array of unicode ranges for code points that are exclusively(!)
used as numbers
// and thus may NOT not be part of names or words like the Chinese/Japanese
number characters
static const sal_uInt32 the_aDigitZeroes [] =
diff --git a/unusedcode.easy b/unusedcode.easy
index 5a67cee..6e6303b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1285,11 +1285,6 @@
libcmis::SessionFactory::getRepositories(std::__debug::mapint, std::basic_strin
libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString)
libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long,
WPXString, libwpg::WPGFileFormat)
libwpg::WPGraphics::parse(unsigned char const*, unsigned long,
libwpg::WPGPaintInterface*, libwpg::WPGFileFormat)
-linguistic::IsLower(String const, unsigned short, unsigned short, short)
-linguistic::ToLower(unsigned short, short)
-linguistic::ToTitle(String const, short)
-linguistic::ToUpper(String const, short)
-linguistic::ToUpper(unsigned short, short)
nullcanvas::CanvasFont::getFontMatrix() const
nullcanvas::CanvasHelper::flush() const
nullcanvas::CanvasHelper::getPalette()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - formula/inc formula/source
formula/inc/formula/FormulaCompiler.hxx |1 - formula/inc/formula/compiler.hrc| 25 + formula/inc/formula/opcode.hxx |9 + formula/inc/formula/tokenarray.hxx |1 + formula/source/core/api/FormulaCompiler.cxx | 24 +++- formula/source/core/api/token.cxx |7 +++ 6 files changed, 33 insertions(+), 34 deletions(-) New commits: commit a61057eb182d680eefaa996c0b4cd13ba4bdfcc0 Author: Eike Rathke er...@erack.de Date: Wed Feb 8 10:42:49 2012 -0500 fix fdo#40590 stop abusing regular string token for XML import During XML import formulas of defined names and conditional formatting were remembered as regular svString tokens that then later were retrieved without quotes for compilation. This didn't go along with the new ScRangeData::CompileUnresolvedXML() that recreates the formula string from an already tokenized form of the formula. Introduced FormulaToken::AddStringXML() with ocStringXML to sort those out and removed the IsImportingXML() hack from FormulaCompiler::AppendString(), the ocStringXML case is handled in FormulaCompiler::CreateStringFromToken(). Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx index 166d522..cc5c070 100644 --- a/formula/inc/formula/FormulaCompiler.hxx +++ b/formula/inc/formula/FormulaCompiler.hxx @@ -270,7 +270,6 @@ protected: virtual void CreateStringFromMatrix(rtl::OUStringBuffer rBuffer,FormulaToken* pTokenP); virtual void CreateStringFromIndex(rtl::OUStringBuffer rBuffer,FormulaToken* pTokenP); virtual void LocalizeString( String rName ); // modify rName - input: exact name -virtual sal_Bool IsImportingXML() const; sal_Bool GetToken(); OpCode NextToken(); diff --git a/formula/inc/formula/compiler.hrc b/formula/inc/formula/compiler.hrc index c1a8117..1fef2e6 100755 --- a/formula/inc/formula/compiler.hrc +++ b/formula/inc/formula/compiler.hrc @@ -44,18 +44,19 @@ #define SC_OPCODE_SEP10 #define SC_OPCODE_MISSING11 /* special OpCodes */ #define SC_OPCODE_BAD12 -#define SC_OPCODE_SPACES 13 -#define SC_OPCODE_MAT_REF14 -#define SC_OPCODE_DB_AREA15 /* additional access operators */ -#define SC_OPCODE_MACRO 16 -#define SC_OPCODE_COL_ROW_NAME 17 -#define SC_OPCODE_COL_ROW_NAME_AUTO 18 -#define SC_OPCODE_PERCENT_SIGN 19 /* operator _follows_ value */ -#define SC_OPCODE_ARRAY_OPEN 20 -#define SC_OPCODE_ARRAY_CLOSE21 -#define SC_OPCODE_ARRAY_ROW_SEP 22 -#define SC_OPCODE_ARRAY_COL_SEP 23 /* some convs use sep != col_sep */ -#define SC_OPCODE_STOP_DIV 24 +#define SC_OPCODE_STRINGXML 13 +#define SC_OPCODE_SPACES 14 +#define SC_OPCODE_MAT_REF15 +#define SC_OPCODE_DB_AREA16 /* additional access operators */ +#define SC_OPCODE_MACRO 17 +#define SC_OPCODE_COL_ROW_NAME 18 +#define SC_OPCODE_COL_ROW_NAME_AUTO 19 +#define SC_OPCODE_PERCENT_SIGN 20 /* operator _follows_ value */ +#define SC_OPCODE_ARRAY_OPEN 21 +#define SC_OPCODE_ARRAY_CLOSE22 +#define SC_OPCODE_ARRAY_ROW_SEP 23 +#define SC_OPCODE_ARRAY_COL_SEP 24 /* some convs use sep != col_sep */ +#define SC_OPCODE_STOP_DIV 25 /*** error constants #... ***/ #define SC_OPCODE_START_ERRORS 30 diff --git a/formula/inc/formula/opcode.hxx b/formula/inc/formula/opcode.hxx index 03e86eb..f417e11 100644 --- a/formula/inc/formula/opcode.hxx +++ b/formula/inc/formula/opcode.hxx @@ -53,10 +53,11 @@ enum OpCodeEnum ocArrayRowSep = SC_OPCODE_ARRAY_ROW_SEP, ocArrayColSep = SC_OPCODE_ARRAY_COL_SEP, // Special OpCodes -ocMissing = SC_OPCODE_MISSING, -ocBad = SC_OPCODE_BAD, -ocSpaces = SC_OPCODE_SPACES, -ocMatRef = SC_OPCODE_MAT_REF, +ocMissing = SC_OPCODE_MISSING, +ocBad = SC_OPCODE_BAD, +ocStringXML = SC_OPCODE_STRINGXML, +ocSpaces= SC_OPCODE_SPACES, +ocMatRef= SC_OPCODE_MAT_REF, // Access commands ocDBArea = SC_OPCODE_DB_AREA, ocMacro= SC_OPCODE_MACRO, diff --git a/formula/inc/formula/tokenarray.hxx b/formula/inc/formula/tokenarray.hxx index 3c870de..cbbab00 100644 --- a/formula/inc/formula/tokenarray.hxx +++ b/formula/inc/formula/tokenarray.hxx @@ -214,6 +214,7 @@ public: FormulaToken* AddExternal( const String rStr, OpCode eOp = ocExternal ); FormulaToken* AddBad( const sal_Unicode* pStr ); /// ocBad with String
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sc/inc sc/source
sc/inc/compiler.hxx | 12 ++-
sc/inc/rangenam.hxx | 25 +--
sc/source/core/data/conditio.cxx | 12 +--
sc/source/core/data/document.cxx |3
sc/source/core/data/table2.cxx|3
sc/source/core/tool/compiler.cxx | 15 +---
sc/source/core/tool/rangenam.cxx | 131 +-
sc/source/ui/docshell/docfunc.cxx |4 -
sc/source/ui/view/viewfunc.cxx|2
9 files changed, 137 insertions(+), 70 deletions(-)
New commits:
commit e8a321db4419be43c693d5b5d06bfda25709d2f5
Author: Eike Rathke er...@erack.de
Date: Wed Feb 8 10:42:04 2012 -0500
fix fdo#40590 stop abusing regular string token for XML import
During XML import formulas of defined names and conditional formatting
were remembered as regular svString tokens that then later were
retrieved without quotes for compilation. This didn't go along with the
new ScRangeData::CompileUnresolvedXML() that recreates the formula
string from an already tokenized form of the formula.
Introduced FormulaToken::AddStringXML() with ocStringXML to sort those
out and removed the IsImportingXML() hack from
FormulaCompiler::AppendString(), the ocStringXML case is handled in
FormulaCompiler::CreateStringFromToken().
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 6947460..d317150 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -542,7 +542,6 @@ private:
virtual void CreateStringFromMatrix( rtl::OUStringBuffer rBuffer,
formula::FormulaToken* _pTokenP);
virtual void CreateStringFromIndex(rtl::OUStringBuffer
rBuffer,formula::FormulaToken* _pTokenP);
virtual void LocalizeString( String rName ); // modify rName -
input: exact name
-virtual sal_Bool IsImportingXML() const;
/// Access the CharTable flags
inline sal_uLong GetCharTableFlags( sal_Unicode c, sal_Unicode cLast )
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 642c39b..f3571c5 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -316,10 +316,10 @@ void ScConditionEntry::Compile( const String rExpr1,
const String rExpr2,
aComp.SetGrammar( eGrammar1 );
if ( pDoc-IsImportingXML() !bTextToReal )
{
-// temporary formula string as string tokens
-//!merge with lcl_ScDocFunc_CreateTokenArrayXML
+// temporary formula string as string tokens
+//! merge with lcl_ScDocFunc_CreateTokenArrayXML
pFormula1 = new ScTokenArray;
-pFormula1-AddString( rExpr1 );
+pFormula1-AddStringXML( rExpr1 );
// bRelRef1 is set when the formula is compiled again
(CompileXML)
}
else
@@ -353,10 +353,10 @@ void ScConditionEntry::Compile( const String rExpr1,
const String rExpr2,
aComp.SetGrammar( eGrammar2 );
if ( pDoc-IsImportingXML() !bTextToReal )
{
-// temporary formula string as string tokens
-//!merge with lcl_ScDocFunc_CreateTokenArrayXML
+// temporary formula string as string tokens
+//! merge with lcl_ScDocFunc_CreateTokenArrayXML
pFormula2 = new ScTokenArray;
-pFormula2-AddString( rExpr2 );
+pFormula2-AddStringXML( rExpr2 );
// bRelRef2 is set when the formula is compiled again
(CompileXML)
}
else
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a4938f1..542b1d0 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5123,10 +5123,6 @@ void ScCompiler::LocalizeString( String rName )
ScGlobal::GetAddInCollection()-LocalizeString( rName );
}
//
-
-sal_Bool ScCompiler::IsImportingXML() const
-{
-return pDoc-IsImportingXML();
-}
// Put quotes around string if non-alphanumeric characters are contained,
// quote characters contained within are escaped by '\\'.
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index c4df591..9349da8 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -1008,9 +1008,9 @@ sal_Bool ScDocFunc::PutData( const ScAddress rPos,
ScEditEngineDefaulter rEngi
ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const String rText, const
String rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar )
{
ScTokenArray* pCode = new ScTokenArray;
-pCode-AddString( rText );
+pCode-AddStringXML( rText );
if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL)
(rFormulaNmsp.Len() 0) )
-pCode-AddString( rFormulaNmsp );
+
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx | 28
sw/source/filter/ww8/rtfattributeoutput.hxx |6 ++
2 files changed, 30 insertions(+), 4 deletions(-)
New commits:
commit 1f77a5e8d5bf8a7f1b7bd7206996d2b2efc59462
Author: Miklos Vajna vmik...@frugalware.org
Date: Wed Feb 8 16:49:57 2012 +0100
n#203704 fix RTF export table output for subtables
Older ODT files containing table:table table:is-sub-table=true
confused the RTF exporter. Add a few sanity checks to make sure the
output is still valid.
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 52d80fc..875edfb 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -251,13 +251,19 @@ void RtfAttributeOutput::StartParagraph(
ww8::WW8TableNodeInfo::Pointer_t pTextN
{
ww8::WW8TableNodeInfoInner::Pointer_t pDeepInner(
pTextNodeInfo-getInnerForDepth( m_nTableDepth ) );
OSL_ENSURE( pDeepInner, TableNodeInfoInner not found);
-if ( pDeepInner pDeepInner-getCell() == 0 )
+// Make sure we always start a row between ending one and starting
a cell.
+// In case of subtables, we may not get the first cell.
+if ((pDeepInner pDeepInner-getCell() == 0) || m_bTableRowEnded)
+{
+m_bTableRowEnded = false;
StartTableRow( pDeepInner );
+}
StartTableCell( pDeepInner );
}
-if ( nRow == 0 nCell == 0 )
+// Again, if depth was incremented, start a new table even if we
skipped the first cell.
+if ((nRow == 0 nCell == 0) || (m_nTableDepth == 0
pTextNodeInfo-getDepth()))
{
// Do we have to start the table?
// [If we are at the rigth depth already, it means that we
@@ -610,7 +616,10 @@ void RtfAttributeOutput::TableDefinition(
ww8::WW8TableNodeInfoInner::Pointer_t
rLR.GetLeft() - rLR.GetRight();
}
SwTwips nTblSz = pFmt-GetFrmSize().GetWidth();
-for( sal_uInt16 i = 0; i pRow-GetCells().Count(); i++ )
+// Not using m_nTableDepth, which is not yet incremented here.
+sal_uInt32 nCurrentDepth = pTableTextNodeInfoInner-getDepth();
+m_aCells[nCurrentDepth] = pRow-GetCells().Count();
+for( sal_uInt16 i = 0; i m_aCells[nCurrentDepth]; i++ )
{
SwWriteTableCell *pCell = pRow-GetCells( )[ i ];
const SwFrmFmt *pCellFmt = pCell-GetBox()-GetFrmFmt();
@@ -906,6 +915,9 @@ void RtfAttributeOutput::StartTableRow(
ww8::WW8TableNodeInfoInner::Pointer_t pT
// We'll write the table definition for nested tables later
if ( nCurrentDepth 1 )
return;
+// Empty the previous row closing buffer before starting the new one,
+// necessary for subtables.
+m_rExport.Strm() m_aAfterRuns.makeStringAndClear().getStr();
m_rExport.Strm() m_aRowDefs.makeStringAndClear().getStr();
}
}
@@ -944,12 +956,17 @@ void RtfAttributeOutput::EndTableCell( )
m_bTableCellOpen = false;
m_bTblAfterCell = true;
m_bWroteCellInfo = false;
+m_aCells[m_nTableDepth]--;
}
void RtfAttributeOutput::EndTableRow( )
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC , (depth is m_nTableDepth
));
+// Trying to end the row without writing the required number of cells?
Fill with empty ones.
+for( sal_uInt16 i = 0; i m_aCells[m_nTableDepth]; i++ )
+m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_CELL);
+
if ( m_nTableDepth 1 )
{
m_aAfterRuns.append({ OOO_STRING_SVTOOLS_RTF_IGNORE
OOO_STRING_SVTOOLS_RTF_NESTTABLEPROPRS);
@@ -971,6 +988,7 @@ void RtfAttributeOutput::EndTableRow( )
}
m_aAfterRuns.append(OOO_STRING_SVTOOLS_RTF_ROW).append(OOO_STRING_SVTOOLS_RTF_PARD);
}
+m_bTableRowEnded = true;
}
void RtfAttributeOutput::EndTable()
@@ -2997,7 +3015,9 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport
rExport )
m_bBufferSectionHeaders( false ),
m_bLastTable( true ),
m_bWroteCellInfo( false ),
-m_bHadFieldResult( false )
+m_bHadFieldResult( false ),
+m_bTableRowEnded( false ),
+m_aCells()
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 8766c5a..eea4b8c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -533,6 +533,12 @@ private:
* If we had a field result in the URL.
*/
bool m_bHadFieldResult;
+
+/// If we ended a table row without starting a new one.
+bool m_bTableRowEnded;
+
+/// Number of cells from the table definition, by depth.
+std::mapsal_uInt32,sal_uInt32 m_aCells;
public:
RtfAttributeOutput( RtfExport rExport );
___
Libreoffice-commits mailing list
[Libreoffice-commits] .: hsqldb/makefile.mk hsqldb/patches
hsqldb/makefile.mk|3
hsqldb/patches/jdbc-4.1.patch | 267 ++
2 files changed, 269 insertions(+), 1 deletion(-)
New commits:
commit 7dbfc0012cc75e7dac9a416b53149ad8ec33f071
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 8 16:03:50 2012 +
make hsqldb build with java 1.7
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk
index 8b3d5b1..2e9fa8a 100755
--- a/hsqldb/makefile.mk
+++ b/hsqldb/makefile.mk
@@ -56,7 +56,8 @@ CONVERTFILES=build$/build.xml \
PATCH_FILES=patches$/i96823.patch \
patches$/i97032.patch \
patches$/i103528.patch \
-patches$/i104901.patch
+patches$/i104901.patch \
+patches$/jdbc-4.1.patch
.IF $(JAVACISGCJ)==yes
JAVA_HOME=
diff --git a/hsqldb/patches/jdbc-4.1.patch b/hsqldb/patches/jdbc-4.1.patch
new file mode 100644
index 000..89149c4
--- /dev/null
+++ b/hsqldb/patches/jdbc-4.1.patch
@@ -0,0 +1,267 @@
+--- misc/hsqldb/build/build.xml2012-02-08 15:14:42.827123541 +
misc/build/hsqldb/build/build.xml 2012-02-08 15:21:43.827722388 +
+@@ -98,7 +98,11 @@
+ echo message=ant.java.hasjsse=${ant.java.hasjsse} /
+/target
+
+- target name=javaversion6
++ target name=javaversion7
++ available classname=java.util.Objects property=ant.java.iscjava17/
++ /target
++
++ target name=javaversion6 depends=javaversion7
unless=ant.java.iscjava17
+ available classname=java.net.IDN property=ant.java.iscjava16/
+/target
+
+@@ -210,6 +214,7 @@
+ arg value=+JAVA2FULL/
+ arg value=-JAVA4/
+ arg value=-JAVA6/
++arg value=-JAVA7/
+/java
+ /target
+
+@@ -244,6 +249,7 @@
+ arg value=+JAVA2FULL/
+ arg value=+JAVA4/
+ arg value=-JAVA6/
++arg value=-JAVA7/
+/java
+ /target
+
+@@ -279,10 +285,47 @@
+ arg value=+JAVA2FULL/
+ arg value=+JAVA4/
+ arg value=+JAVA6/
++arg value=+JAVA7/
++ /java
++/target
++
++target name=switchtojdk17 depends=switchtojdk16
++description=self explanatory if=ant.java.iscjava17
++ java classname=org.hsqldb.util.CodeSwitcher classpath=classes
++arg file=${src}/org/hsqldb/lib/java/JavaSystem.java/
++arg file=${src}/org/hsqldb/lib/HsqlTimer.java/
++arg file=${src}/org/hsqldb/jdbcDriver.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcBlob.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcDatabaseMetaData.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcDataSource.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcCallableStatement.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcClob.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcConnection.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcParameterMetaData.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcPreparedStatement.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcResultSet.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcResultSetMetaData.java/
++arg file=${src}/org/hsqldb/jdbc/jdbcStatement.java/
++arg file=${src}/org/hsqldb/persist/LockFile.java/
++arg file=${src}/org/hsqldb/persist/Logger.java/
++arg file=${src}/org/hsqldb/persist/ScaledRAFile.java/
++arg file=${src}/org/hsqldb/rowio/RowInputTextLog.java/
++arg file=${src}/org/hsqldb/util/DatabaseManager.java/
++arg file=${src}/org/hsqldb/util/ConnectionDialogCommon.java/
++arg file=${src}/org/hsqldb/lib/SimpleLog.java/
++arg file=${src}/org/hsqldb/rowio/RowInputTextLog.java/
++arg file=${src}/org/hsqldb/lib/SimpleLog.java/
++arg file=${src}/org/hsqldb/rowio/RowInputTextLog.java/
++arg file=${src}/org/hsqldb/HsqlDateTime.java/
++arg value=+JAVA2/
++arg value=+JAVA2FULL/
++arg value=+JAVA4/
++arg value=+JAVA6/
++arg value=+JAVA7/
+ /java
+ /target
+
+-target name=store depends=switchtojdk16
++target name=store depends=switchtojdk17
+ description=compiles the /store folder
+ javac srcdir=${src}
+ destdir=classes
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java 2012-02-08
15:14:42.802123563 +
misc/build/hsqldb/src/org/hsqldb/jdbc/jdbcCallableStatement.java
2012-02-08 15:47:35.842635642 +
+@@ -3375,4 +3375,18 @@
+ }
+
+ //#endif JAVA6
++
++//#ifdef JAVA7
++public T T getObject(String columnLabel, ClassT type) throws
SQLException
++{
++throw new UnsupportedOperationException(Not supported yet.);
++}
++
++public T T getObject(int ColumnIndex, ClassT type) throws SQLException
++{
++throw new UnsupportedOperationException(Not supported yet.);
++}
++
++
++//#endif JAVA7
+ }
+--- misc/hsqldb/src/org/hsqldb/jdbc/jdbcConnection.java2012-02-08
15:14:42.802123563 +
[Libreoffice-commits] .: Makefile solenv/gbuild
Makefile |9 solenv/gbuild/gbuild.help.txt | 76 +++ solenv/gbuild/gbuild.mk | 81 -- 3 files changed, 86 insertions(+), 80 deletions(-) New commits: commit d85a108a1b37b9dbaf151d4141e21674ab53f569 Author: Norbert Thiebaud nthieb...@gmail.com Date: Wed Feb 8 10:16:23 2012 -0600 re-enable make help from the top-level make diff --git a/Makefile b/Makefile index 45b7053..24b2a5b 100644 --- a/Makefile +++ b/Makefile @@ -440,4 +440,13 @@ debugrun: endif # not clean or distclean +# +# help +# +.PHONY: help +help: + @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt + @true + + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt new file mode 100644 index 000..d93285f --- /dev/null +++ b/solenv/gbuild/gbuild.help.txt @@ -0,0 +1,76 @@ +NAME + gbuild - GNU make based build system for LibreOffice + +SYNOPSIS + make [ -f makefile ] [ options ] [ variable=value ... ] [ targets ] ... + +IMPORTANT OPTIONS + -s Silent operation; do not print the commands as they are executed. + + -n Print the commands that would be executed, but do not execute them. + -k Continue as much as possible after an error. + + -j Specifies the number of jobs (commands) to run simultaneously. + -l Specifies that no new jobs (commands) should be started if there are + others jobs running and the load average is at least load. + + -t Touch files (mark them up to date without really changing them) + instead of running their commands. + -W Pretend that the target file has just been modified. + -o Do not remake the file file even if it is older than its + dependencies, and do not remake anything on account of changes in file. + + -p Print the data base (rules and variable values) that results from + reading the makefiles. + --debug=b debug make run, see GNU make man page for details + + (descriptions from GNU make man page) + +AVAILABLE TARGETS + all build product and run unit tests (default goal) + buildbuild product + unitcheckrun unit tests + subsequentcheck run system tests (requires full installation) + checkrun unit tests and if in toplevel subsequentcheck + cleanremove all generated files + showdeliverables show the targets delivered to OUTDIR and their source + debugrun starts the dev-install instance and allows tests to be run +against it + module build the named module + module.clean clean the named module + module.all for dmake modules only, build the named module and +the pre-requisite modules for this module + module.deliver for dmake modules only, deliver the named module + cmd execute the command contained in the variable cmd= +in a shell with config_host.mk or config_build.mk +environement set. (see gb_SIDE) + +INTERACTIVE VARIABLES: + DEBUG / debug If not empty, build with DBGLEVEL=1 (see below). + ENABLE_SYMBOLS / enable_symbols + If not empty, build with debug symbols. Automatically + enabled by DEBUG/debug. + DBGLEVEL / dbglevel + If not empty, force the debug level to the specified value. The + debug level is passed to the source code through OSL_DEBUG_LEVEL + macro. + 0 = no debug + 1 = symbols + no optimizations + 2 = symbols + no optimizations + extra debug output. OSL_TRACE + starts being active on this level. + 3... = symbols + no optimizations + extra debug output (usually + extremely verbose). Levels 2 are not used very much. + + YACCFLAGS Add as flags for YACC parser generator invocation. + CPPFLAGSAdd as preprocessor flags for C/C++/ObjC/ObjC++ compilation. + CFLAGS Add as compiler flags for plain C compilation. + CXXFLAGSAdd as compiler flags for C++ compilation. + OBJCFLAGS Add as compiler flags for Objective C compilation. + OBJCXXFLAGS Add as compiler flags for Objective C++ compilation. + LDFLAGS Add as linker flags. + gb_FULLDEPS Generate and use dependencies (on by default, handle with care). + gb_COLORUse ASCII color output. + gb_TITLES Show progress in terminal title. + gb_Side Either host of build (default to host). + determine if config_host.mk or config_build.mk is used to +
[Libreoffice-commits] .: filter/source
filter/source/msfilter/msdffimp.cxx |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 38af1195a9a24af4aaff84e7be318007b82f9b47 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Feb 8 17:38:57 2012 +0100 do not deserialize into long, use a type of the correct width (fdo#40768) diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 5871da9..2a91c24 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6672,7 +6672,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream rBLIPStream, Graphic rData, rBLIPStream.SeekRel( nSkip + 20 ); // read in size of metafile in EMUS -rBLIPStream aMtfSize100.Width() aMtfSize100.Height(); +sal_Int32 width, height; +rBLIPStream width height; +aMtfSize100.Width() = width; +aMtfSize100.Height() = height; // scale to 1/100mm aMtfSize100.Width() /= 360, aMtfSize100.Height() /= 360; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/util
instsetoo_native/util/makefile.mk |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 62e8dfa072d78c18464db9a43ffc3f7b287032b2 Author: Petr Mladek pmla...@suse.cz Date: Wed Feb 8 17:46:59 2012 +0100 Create test packages even when SDK is disabled Also fixed order in the other makefile target to make it clear that it differs in the SDK diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 017836c..04acba4 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -95,13 +95,13 @@ ALLTAR : $(LOCALPYFILES) .IF $(GUI)==WNT ALLTAR : openofficeall ooohelppack .ELSE -ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) +ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) .ENDIF .ELSE .IF $(GUI)==WNT ALLTAR : openofficeall ooohelppack sdkooall .ELSE -ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US $(eq,$(OS),MACOSX $(NULL) lotest_en-US) +ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US .ENDIF .ENDIF .ELSE # $(ENABLE_RELEASE_BUILD)==TRUE @@ -109,13 +109,13 @@ ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) .IF $(GUI)==WNT ALLTAR : openofficedevall ooodevhelppack .ELSE -ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) +ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) .ENDIF .ELSE .IF $(GUI)==WNT ALLTAR : openofficedevall ooodevhelppack sdkoodevall .ELSE -ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) +ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US .ENDIF .ENDIF .ENDIF # $(ENABLE_RELEASE_BUILD)==TRUE ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source sfx2/source svl/inc svl/source svtools/source sw/source
cui/source/tabpages/macroass.cxx |2 +-
sfx2/source/config/evntconf.cxx |2 +-
svl/inc/svl/macitem.hxx | 22 +++---
svl/source/items/macitem.cxx | 17 +++--
svtools/source/svhtml/htmlout.cxx |2 +-
sw/source/ui/dochdl/gloshdl.cxx |8
sw/source/ui/misc/glossary.cxx|4 ++--
sw/source/ui/misc/glshell.cxx |6 +++---
8 files changed, 30 insertions(+), 33 deletions(-)
New commits:
commit 9b979c8bf13593175391efcab461a146d6f1331e
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Feb 9 01:50:21 2012 +0900
Replaced String by rtl::OUString in SvxMacro
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index abd7123..3128df1 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -131,7 +131,7 @@ String ConvertToUIName_Impl( SvxMacro *pMacro )
{
String aName( pMacro-GetMacName() );
String aEntry;
-if ( ! pMacro-GetLanguage().EqualsAscii(JavaScript) )
+if ( !
pMacro-GetLanguage().equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(JavaScript)) )
{
sal_uInt16 nCount = comphelper::string::getTokenCount(aName, '.');
aEntry = aName.GetToken( nCount-1, '.' );
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 5ae485b..4f693a1 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -274,7 +274,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc,
rtl::OUString aEventName, const
void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const
SvxMacro rMacro, SfxObjectShell *pDoc )
{
boost::scoped_ptrSvxMacro pMacro;
-if ( rMacro.GetMacName().Len() )
+if ( rMacro.HasMacro() )
pMacro.reset( new SvxMacro( rMacro.GetMacName(), rMacro.GetLibName(),
rMacro.GetScriptType() ) );
PropagateEvent_Impl( pDoc ? pDoc : 0, aName, pMacro.get() );
}
diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 2bc93a1..7261316 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.hxx
@@ -70,29 +70,29 @@ class SjJSbxObject;
class SVL_DLLPUBLIC SvxMacro
{
-String aMacName;
-String aLibName;
+::rtl::OUString aMacName;
+::rtl::OUString aLibName;
// Fuer JavaScript muss ein Function-Objekt gehalten werden
SjJSbxObjectBase* pFunctionObject;
ScriptType eType;
public:
-SvxMacro( const String rMacName, const String rLanguage);
+SvxMacro( const ::rtl::OUString rMacName, const ::rtl::OUString
rLanguage);
-SvxMacro( const String rMacName, const String rLibName,
+SvxMacro( const ::rtl::OUString rMacName, const ::rtl::OUString rLibName,
ScriptType eType); // = STARBASIC entfernt
-SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String rSource );
+SvxMacro( SjJSbxObjectBase* _pFunctionObject, const ::rtl::OUString
rSource );
~SvxMacro();// noetig fuer pFunctionObject
-const String GetLibName() const{ return aLibName; }
-const String GetMacName() const{ return aMacName; }
-String GetLanguage()const;
+const ::rtl::OUString GetLibName() const{ return aLibName; }
+const ::rtl::OUString GetMacName() const{ return aMacName; }
+::rtl::OUString GetLanguage()const;
ScriptType GetScriptType() const{ return eType; }
-sal_Bool HasMacro() const { return aMacName.Len() ? sal_True :
sal_False; }
+bool HasMacro() const { return !aMacName.isEmpty(); }
#ifdef SOLAR_JAVA
// JavaScript-Function-Objekt holen
@@ -103,12 +103,12 @@ public:
SvxMacro operator=( const SvxMacro rBase );
};
-inline SvxMacro::SvxMacro( const String rMacName, const String rLibName,
+inline SvxMacro::SvxMacro( const ::rtl::OUString rMacName, const
::rtl::OUString rLibName,
ScriptType eTyp )
: aMacName( rMacName ), aLibName( rLibName ), pFunctionObject(NULL),
eType( eTyp )
{}
-inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const String
rSource )
+inline SvxMacro::SvxMacro( SjJSbxObjectBase* _pFunctionObject, const
::rtl::OUString rSource )
: aMacName( rSource ), pFunctionObject( _pFunctionObject ), eType(
JAVASCRIPT )
{}
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 8406ca4..44abf85 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -50,13 +50,13 @@ SjJSbxObjectBase* SjJSbxObjectBase::Clone( void )
return NULL;
}
-SvxMacro::SvxMacro( const String rMacName, const String rLanguage)
+SvxMacro::SvxMacro( const ::rtl::OUString rMacName, const ::rtl::OUString
rLanguage)
: aMacName( rMacName ), aLibName( rLanguage),
pFunctionObject(NULL), eType( EXTENDED_STYPE)
{
-if (rLanguage.EqualsAscii(SVX_MACRO_LANGUAGE_STARBASIC))
+if
(rLanguage.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(SVX_MACRO_LANGUAGE_STARBASIC)))
eType=STARBASIC;
-else
[Libreoffice-commits] .: 3 commits - sc/Module_sc.mk solenv/gbuild
sc/Module_sc.mk |5 +- solenv/gbuild/Module.mk | 43 +++--- solenv/gbuild/TargetLocations.mk |1 solenv/gbuild/extensions/post_DisableIosUnitchecks.mk |1 solenv/gbuild/extensions/post_SpeedUpTargets.mk |1 solenv/gbuild/gbuild.help.txt |1 6 files changed, 46 insertions(+), 6 deletions(-) New commits: commit 17f59f3aa995dd324ec88974b6196402f8fd89f0 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Feb 8 15:28:09 2012 +0100 stick to three-letter length diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index f99c4cb..c46a2e8 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -69,7 +69,7 @@ $(call gb_Module_get_check_target,%) : touch $@) $(call gb_Module_get_slowcheck_target,%) : - $(call gb_Output_announce,$*,$(true),SCHK,5) + $(call gb_Output_announce,$*,$(true),SLC,5) $(call gb_Output_announce_title,module $* slowchecks done.) -$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) \ commit 7472fe259e2cc94ddf66de29ab1d287d0775ceb3 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Feb 8 15:07:40 2012 +0100 remove superflous whitespace diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 2825cce..ef47326 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -45,7 +45,7 @@ $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_filters_test \ )) -$(eval $(call gb_Module_add_slowcheck_targets, sc,\ +$(eval $(call gb_Module_add_slowcheck_targets,sc,\ CppunitTest_sc_ucalc \ )) commit 590c2400f168faa6eccf793b478d681dcdb73ca7 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Fri Jan 13 20:51:34 2012 +0100 first try to add slowcheck build target diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 112fa40..2825cce 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -42,10 +42,13 @@ $(eval $(call gb_Module_add_targets,sc,\ endif $(eval $(call gb_Module_add_check_targets,sc,\ -CppunitTest_sc_ucalc \ CppunitTest_sc_filters_test \ )) +$(eval $(call gb_Module_add_slowcheck_targets, sc,\ +CppunitTest_sc_ucalc \ +)) + $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ JunitTest_sc_complex \ JunitTest_sc_unoapi \ diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk index 24cc1e5..f99c4cb 100644 --- a/solenv/gbuild/Module.mk +++ b/solenv/gbuild/Module.mk @@ -34,10 +34,12 @@ # excluding tests recursive Modules # Module/unitcheckrun unit tests all unit tests # recursive Module/checks +# Module/slowcheckrun all slow unit tests # Module/subsequentcheck run system tests all system tests # recursive Module/subsequentchecks # build (global) build the producttop-level Module # unitcheck (global) run unit tests top-level Module/unitcheck +# slowcheck (global) run slow unit tests top-level Module/slowcheck # subsequentcheck (global)run system tests top-level Module/subsequentcheck # all (global)default goal build unitcheck @@ -48,6 +50,7 @@ gb_Module_ALLMODULES := gb_Module_MODULELOCATIONS := gb_Module_TARGETSTACK := gb_Module_CHECKTARGETSTACK := +gb_Module_SLOWCHECKTARGETSTACK := gb_Module_SUBSEQUENTCHECKTARGETSTACK := gb_Module_CLEANTARGETSTACK := @@ -56,7 +59,7 @@ $(call gb_Module_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),MOD,5) $(call gb_Output_announce_title,module $* cleared.) -$(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_subsequentcheck_target,$*)) + rm -f $(call gb_Module_get_target,$*) $(call gb_Module_get_check_target,$*) $(call gb_Module_get_slowcheck_target,$*) $(call gb_Module_get_subsequentcheck_target,$*)) $(call gb_Module_get_check_target,%) : $(call gb_Output_announce,$*,$(true),CHK,5) @@ -65,6 +68,13 @@ $(call gb_Module_get_check_target,%) : mkdir -p $(dir $@) \ touch $@) +$(call gb_Module_get_slowcheck_target,%) : + $(call gb_Output_announce,$*,$(true),SCHK,5) + $(call gb_Output_announce_title,module $* slowchecks done.) + -$(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $@) \ + touch $@) + $(call gb_Module_get_subsequentcheck_target,%) : $(call gb_Output_announce,$*,$(true),SCK,5) $(call gb_Output_announce_title,module $* subsequentchecks done.) @@ -79,7 +89,7 @@ $(call gb_Module_get_target,%) :
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/api/RowSetCache.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 23151ab53574e0e893f4507313ff15388638746a
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 8 21:51:38 2012 +0100
Tentative fix for invalid iterator range regression
37b5dce665a03d3404e6a710b82bef16d740d178 re-wrote a std::rotate call to
cause
an error: function requires a valid iterator range [__middle, __last)
abort
from debug-mode GCC libstdc++ during smoketest. Lionel should check whether
this fix is actually good -- at least, it causes make check to succeed
again.
diff --git a/dbaccess/source/core/api/RowSetCache.cxx
b/dbaccess/source/core/api/RowSetCache.cxx
index df833a2..77eae6e 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -940,7 +940,14 @@ sal_Bool ORowSetCache::moveWindow()
bCheck = fill(aIter, aNewEnd, nPos, bCheck);
}
-::std::rotate(m_pMatrix-begin(), aEnd, aNewEnd);
+if ( aEnd = aNewEnd )
+{
+::std::rotate(m_pMatrix-begin(), aEnd, aNewEnd);
+}
+else
+{
+::std::rotate(m_pMatrix-begin(), aNewEnd, aEnd);
+}
// now correct the iterator in our iterator vector
// rotateCacheIterator(aEnd-m_pMatrix-begin()); //can't be
used because they decrement and here we need to increment
ORowSetCacheMap::iterator aCacheIter =
m_aCacheIterators.begin();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/AllLangResTarget.mk |2 +- solenv/gbuild/Configuration.mk|2 +- solenv/gbuild/Extension.mk|5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) New commits: commit aa11b4c86e4b41be542623b7d98a3fb8e5d30745 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 8 21:57:19 2012 +0100 Properly rebuild files generated by l10ntools programs (Changing the corresponding build-order-only dependencies to proper ones should be safe here, as all mentions of $^ are within $(filter) calls.) diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 21570c7..635778d 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -65,7 +65,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET) +$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET) $(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$),mkdir -p $(dir $@) cp $ $@) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 0674837..1743be4 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -238,7 +238,7 @@ $(call gb_Helper_abbreviate_dirs_native,\ -l all) endef -$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET) +$(call gb_XcuMergeTarget_get_target,%) : $(gb_XcuMergeTarget_CFGEXTARGET) $(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) cp $(filter %.xcu,$^) $@) $(call gb_XcuMergeTarget_get_clean_target,%) : diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 5ee8a97..fc7708e 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -61,8 +61,7 @@ $(call gb_Extension_get_workdir,%)/description.xml : mkdir -p $(call gb_Extension_get_workdir,$*) \ cp -f $(LOCATION)/description.xml $@) else -$(call gb_Extension_get_workdir,%)/description.xml : | \ - $(gb_Extension_XRMEXTARGET) +$(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXTARGET) $(call gb_Output_announce,$*/description.xml,$(true),XRM,3) ifeq ($(OS_FOR_BUILD),WNT) $(call gb_Helper_abbreviate_dirs_native,\ @@ -168,7 +167,7 @@ endef define gb_Extension_localize_help_onelang $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_workdir,$(1))/$(2) -$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) +$(call gb_Extension_get_workdir,$(1))/$(2) : $(3) gb_Extension_HELPEXTARGET $(call gb_Output_announce,$(2),$(true),XHP,3) mkdir -p $$(dir $$@) ifeq ($(OS_FOR_BUILD),WNT) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: l10ntools/source
l10ntools/source/common.hxx | 113
1 file changed, 113 insertions(+)
New commits:
commit 1d3124675ae5a33afe2c417a198557f20dc689e0
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 8 22:28:53 2012 +0100
New file was missing from previous commit
diff --git a/l10ntools/source/common.hxx b/l10ntools/source/common.hxx
new file mode 100644
index 000..89808f7
--- /dev/null
+++ b/l10ntools/source/common.hxx
@@ -0,0 +1,113 @@
+/* -*- 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) 2012 Red Hat, Inc., Stephan Bergmann sberg...@redhat.com
+ * (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_L10NTOOLS_SOURCE_COMMON_HXX
+#define INCLUDED_L10NTOOLS_SOURCE_COMMON_HXX
+
+#include sal/config.h
+
+#include cstdlib
+#include iostream
+
+#include osl/file.hxx
+#include osl/process.h
+#include osl/thread.h
+#include rtl/string.h
+#include rtl/string.hxx
+#include rtl/textcvt.h
+#include rtl/uri.hxx
+#include rtl/ustring.h
+#include rtl/ustring.hxx
+
+namespace common {
+
+inline rtl::OString pathnameToken(char const * pathname, char const * root) {
+rtl::OUString cwd;
+if (osl_getProcessWorkingDir(cwd.pData) != osl_Process_E_None) {
+std::cerr Error: Cannot determine cwd\n;
+std::exit(EXIT_FAILURE);
+}
+rtl::OUString full;
+if (!rtl_convertStringToUString(
+full.pData, pathname, rtl_str_getLength(pathname),
+osl_getThreadTextEncoding(),
+(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
+{
+std::cerr Error: Cannot convert input pathname to UTF-16\n;
+std::exit(EXIT_FAILURE);
+}
+if (osl::FileBase::getAbsoluteFileURL(cwd, full, full)
+!= osl::FileBase::E_None)
+{
+std::cerr Error: Cannot convert input pathname to absolute URL\n;
+std::exit(EXIT_FAILURE);
+}
+if (root == 0) {
+std::cerr Error: No project root argument\n;
+std::exit(EXIT_FAILURE);
+}
+rtl::OUString base;
+if (!rtl_convertStringToUString(
+base.pData, root, rtl_str_getLength(root),
+osl_getThreadTextEncoding(),
+(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR)))
+{
+std::cerr Error: Cannot convert project root to UTF-16\n;
+std::exit(EXIT_FAILURE);
+}
+base = rtl::Uri::convertRelToAbs(full, base);
+if (full.getLength() = base.getLength() || base.isEmpty()
+|| base[base.getLength() - 1] != '/'
+|| full[base.getLength() - 1] != '/')
+{
+std::cerr Error: Cannot extract suffix from input pathname\n;
+std::exit(EXIT_FAILURE);
+}
+full = full.copy(base.getLength()).replace('/', '\\');
+rtl::OString suffix;
+if (!full.convertToString(
+suffix, osl_getThreadTextEncoding(),
+(RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
+ | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
+{
+std::cerr Error: Cannot convert suffix from UTF-16\n;
+std::exit(EXIT_FAILURE);
+}
+return suffix;
+}
+
+}
+
+#endif
+
+/* 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] .: 2 commits - configure.in Makefile
Makefile |2 ++
configure.in | 29 +
2 files changed, 31 insertions(+)
New commits:
commit 5582b7f129a4db4204107f2a38ac809684aa6893
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 7 06:36:49 2012 +
add testtools to dmake_modules
diff --git a/Makefile b/Makefile
index 24b2a5b..38ed6fc 100644
--- a/Makefile
+++ b/Makefile
@@ -204,6 +204,7 @@ postgresql\
postprocess\
python\
pyuno\
+pyuno-py3\
rdbmaker\
readlicense_oo\
redland\
@@ -226,6 +227,7 @@ stlport\
stoc\
store\
sysui\
+testtools\
tomcat\
translations\
udm\
commit 8f06cc44149ca6be84b1cd8ce0f609d2dc3db346
Author: Rene Engelhard r...@debian.org
Date: Tue Feb 7 06:28:46 2012 +
configure.in: readd arch-detection for kFreeBSD
diff --git a/configure.in b/configure.in
index 7102f10..7910b2b 100644
--- a/configure.in
+++ b/configure.in
@@ -2820,6 +2820,35 @@ freebsd*)
SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
;;
+kfreebsd*)
+COM=GCC
+GUI=UNX
+GUIBASE=unx
+OS=LINUX
+
+case $host_cpu in
+
+i*86)
+CPU=I
+CPUNAME=INTEL
+OUTPATH=unxkfgi6
+;;
+x86_64)
+CPU=X
+CPUNAME=X86_64
+LIB64=lib64
+OUTPATH=unxkfgx6
+;;
+*)
+AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
+;;
+esac
+SOLAREXTRALIB=-L../$LIB64
+SOLARLIB=-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib
+SOLARLIB=$SOLARLIB -L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
+SOLARLIB=$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib
+;;
+
linux-gnu*)
COM=GCC
GUI=UNX
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/inc sc/source
sc/inc/collect.hxx | 45 ---
sc/source/core/tool/collect.cxx | 120 +---
sc/source/ui/app/inputhdl.cxx | 12
3 files changed, 9 insertions(+), 168 deletions(-)
New commits:
commit 1eecb1841e8692e03e8e0aecaa99e3e7a3300d4c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Feb 8 20:34:23 2012 -0500
ScSortedCollection is now officially unused. Nuking it.
diff --git a/sc/inc/collect.hxx b/sc/inc/collect.hxx
index d175fa3..3dc738f 100644
--- a/sc/inc/collect.hxx
+++ b/sc/inc/collect.hxx
@@ -29,22 +29,10 @@
#ifndef SC_COLLECT_HXX
#define SC_COLLECT_HXX
-#include address.hxx
-#include tools/string.hxx
-
-#ifndef INCLUDED_LIMITS_H
-#include limits.h
-#define INCLUDED_LIMITS_H
-#endif
#include scdllapi.h
+#include rtl/ustring.hxx
-#define MAXCOLLECTIONSIZE 16384
-#define MAXDELTA1024
-#define SCPOS_INVALID USHRT_MAX
-
-#include boost/ptr_container/ptr_set.hpp
-
-class ScDocument;
+#include set
class SC_DLLPUBLIC ScDataObject
{
@@ -83,35 +71,6 @@ public:
ScCollection operator=( const ScCollection rCol );
};
-
-class SC_DLLPUBLIC ScSortedCollection : public ScCollection
-{
-private:
-sal_BoolbDuplicates;
-protected:
-// for ScStrCollection load/store
-voidSetDups( sal_Bool bVal ) { bDuplicates = bVal; }
-sal_BoolIsDups() const { return bDuplicates; }
-public:
-ScSortedCollection(sal_uInt16 nLim = 4, sal_uInt16 nDel = 4, sal_Bool bDup
= false);
-ScSortedCollection(const ScSortedCollection rScSortedCollection) :
-ScCollection(rScSortedCollection),
-bDuplicates(rScSortedCollection.bDuplicates) {}
-
-virtual sal_uInt16 IndexOf(ScDataObject* pScDataObject) const;
-virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2)
const = 0;
-virtual sal_BoolIsEqual(ScDataObject* pKey1, ScDataObject* pKey2)
const;
-sal_BoolSearch(ScDataObject* pScDataObject, sal_uInt16 rIndex)
const;
-virtual sal_BoolInsert(ScDataObject* pScDataObject);
-virtual sal_BoolInsertPos(ScDataObject* pScDataObject, sal_uInt16
nIndex);
-
-sal_Booloperator==(const ScSortedCollection rCmp) const;
-};
-
-//
-// TypedScStrCollection: wie ScStrCollection, nur, dass Zahlen vor Strings
-// sortiert werden
-
class TypedStrData
{
public:
diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx
index 2bbf244..e8f3de6 100644
--- a/sc/source/core/tool/collect.cxx
+++ b/sc/source/core/tool/collect.cxx
@@ -26,16 +26,15 @@
*
/
+#include unotools/transliterationwrapper.hxx
-
+#include collect.hxx
+#include global.hxx
#include string.h
-#include tools/stream.hxx
-#include unotools/transliterationwrapper.hxx
-#include rechead.hxx
-#include collect.hxx
-#include document.hxx // fuer TypedStrData Konstruktor
+#define MAXCOLLECTIONSIZE 16384
+#define MAXDELTA1024
// ---
@@ -197,115 +196,6 @@ ScDataObject* ScCollection::Clone() const
return new ScCollection(*this);
}
-//
-// ScSortedCollection
-//
-
-ScSortedCollection::ScSortedCollection(sal_uInt16 nLim, sal_uInt16 nDel,
sal_Bool bDup) :
-ScCollection (nLim, nDel),
-bDuplicates ( bDup)
-{
-}
-
-//
-
-sal_uInt16 ScSortedCollection::IndexOf(ScDataObject* pScDataObject) const
-{
-sal_uInt16 nIndex;
-if (Search(pScDataObject, nIndex))
-return nIndex;
-else
-return 0x;
-}
-
-//
-
-sal_Bool ScSortedCollection::Search(ScDataObject* pScDataObject, sal_uInt16
rIndex) const
-{
-rIndex = nCount;
-sal_Bool bFound = false;
-short nLo = 0;
-short nHi = nCount - 1;
-short nIndex;
-short nCompare;
-while (nLo = nHi)
-{
-nIndex = (nLo + nHi) / 2;
-nCompare = Compare(pItems[nIndex], pScDataObject);
-if (nCompare 0)
-nLo = nIndex + 1;
-else
-{
-nHi = nIndex - 1;
-if (nCompare == 0)
-{
-bFound = sal_True;
-nLo = nIndex;
-}
-}
-}
-rIndex = nLo;
-return bFound;
-}
-
-//
-
-sal_Bool ScSortedCollection::Insert(ScDataObject* pScDataObject)
-{
-sal_uInt16 nIndex;
-sal_Bool bFound =
[Libreoffice-commits] .: 5 commits - sc/Module_sc.mk sc/source
sc/Module_sc.mk |4 ++--
sc/source/core/data/documen2.cxx |8
sc/source/ui/docshell/impex.cxx |2 +-
sc/source/ui/view/preview.cxx| 15 ++-
4 files changed, 17 insertions(+), 12 deletions(-)
New commits:
commit 73088aaaed3ad16f80405a3d87cea437d350b893
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 8 23:37:49 2012 +0100
we need to explicitly set the paste area in ScMarkData, fdo#45481
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index ede56eb..dd1ed03 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -263,7 +263,7 @@ void ScImportExport::EndPaste()
pRedoDoc-InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() );
pDoc-CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, false,
pRedoDoc );
ScMarkData aDestMark;
-aDestMark.SelectOneTable( aRange.aStart.Tab() );
+aDestMark.SetMarkArea(aRange);
pDocSh-GetUndoManager()-AddUndoAction(
new ScUndoPaste(pDocSh, aRange, aDestMark, pUndoDoc, pRedoDoc,
IDF_ALL, NULL));
}
commit b14f61c40c1ddd897ba4b54c063753c2e3550d46
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 8 21:04:05 2012 +0100
remove unnecessary check
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 51e581c..67e6171 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -269,7 +269,6 @@ void ScPreview::CalcPages()
long nThisStart = nTotalPages;
ScPrintFunc aPrintFunc( this, pDocShell, i, nAttrPage, 0, NULL,
aOptions );
-aPrintFunc.InitParam( aOptions );
long nThisTab = aPrintFunc.GetTotalPages();
nPages[i] = nThisTab;
nTotalPages += nThisTab;
@@ -291,10 +290,7 @@ void ScPreview::CalcPages()
if (nTabCount nTabsTested)
nTabsTested = nTabCount;
-// testen, ob hinter letzter Seite
-
-if ( nTabsTested = nTabCount )
-TestLastPage();
+TestLastPage();
aState.nDocPages = nTotalPages;
commit d7eddc670410d7194918ff99c735052b880469d8
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 8 21:02:01 2012 +0100
remove unnecessary temporary variable
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index 4d72ef9..51e581c 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -231,7 +231,6 @@ void ScPreview::CalcPages()
ScDocument* pDoc = pDocShell-GetDocument();
nTabCount = pDoc-GetTableCount();
-SCTAB nAnz = nTabCount;
SCTAB nStart = nTabsTested;
if (!bValid)
{
@@ -242,7 +241,7 @@ void ScPreview::CalcPages()
// update all pending row heights with a single progress bar,
// instead of a separate progress for each sheet from ScPrintFunc
-pDocShell-UpdatePendingRowHeights( nAnz-1, true );
+pDocShell-UpdatePendingRowHeights( nTabCount-1, true );
// PrintOptions is passed to PrintFunc for SkipEmpty flag,
// but always all sheets are used (there is no selected sheet)
@@ -252,7 +251,8 @@ void ScPreview::CalcPages()
nPages.push_back(0);
while (nStart static_castSCTAB(nFirstAttr.size()))
nFirstAttr.push_back(0);
-for (SCTAB i=nStart; inAnz; i++)
+
+for (SCTAB i=nStart; inTabCount; i++)
{
if ( i == static_castSCTAB(nPages.size()))
nPages.push_back(0);
@@ -269,6 +269,7 @@ void ScPreview::CalcPages()
long nThisStart = nTotalPages;
ScPrintFunc aPrintFunc( this, pDocShell, i, nAttrPage, 0, NULL,
aOptions );
+aPrintFunc.InitParam( aOptions );
long nThisTab = aPrintFunc.GetTotalPages();
nPages[i] = nThisTab;
nTotalPages += nThisTab;
@@ -287,8 +288,8 @@ void ScPreview::CalcPages()
nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages );
-if (nAnz nTabsTested)
-nTabsTested = nAnz;
+if (nTabCount nTabsTested)
+nTabsTested = nTabCount;
// testen, ob hinter letzter Seite
commit d893218da7b3e77c97eb7c96384728776f7c870c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 8 20:06:42 2012 +0100
use slowcheck in sc
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ef47326..074b1f1 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -42,11 +42,12 @@ $(eval $(call gb_Module_add_targets,sc,\
endif
$(eval $(call gb_Module_add_check_targets,sc,\
+CppunitTest_sc_ucalc \
CppunitTest_sc_filters_test \
))
$(eval $(call gb_Module_add_slowcheck_targets,sc,\
-CppunitTest_sc_ucalc \
+CppunitTest_sc_subsequent_filters_test \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
@@ -59,7 +60,6 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
CppunitTest_sc_namedrangeobj \
CppunitTest_sc_namedrangesobj \
CppunitTest_sc_tablesheetsobj \
-
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/docshell/impex.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a00c5917a8deb465cc1322e14a81340f9d69 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Wed Feb 8 23:37:49 2012 +0100 we need to explicitly set the paste area in ScMarkData, fdo#45481 Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index c538977..5abf7d5 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -263,7 +263,7 @@ void ScImportExport::EndPaste() pRedoDoc-InitUndo( pDoc, aRange.aStart.Tab(), aRange.aEnd.Tab() ); pDoc-CopyToDocument( aRange, IDF_ALL | IDF_NOCAPTIONS, false, pRedoDoc ); ScMarkData aDestMark; -aDestMark.SelectOneTable( aRange.aStart.Tab() ); +aDestMark.SetMarkArea(aRange); pDocSh-GetUndoManager()-AddUndoAction( new ScUndoPaste(pDocSh, aRange, aDestMark, pUndoDoc, pRedoDoc, IDF_ALL, NULL)); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen2.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit 3544c86341bd32864cac7f30124a53aef79b89fd
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 8 17:48:15 2012 +0100
copy settings for RTL with sheets, fdo#45768
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 40a10ba..b0ae78e 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -913,6 +913,10 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos,
const ScMarkData* pOnlyM
// Copy the custom print range if exists.
maTabs[nNewPos]-CopyPrintRange(*maTabs[nOldPos]);
+
+// Copy the RTL settings
+maTabs[nNewPos]-SetLayoutRTL(maTabs[nOldPos]-IsLayoutRTL());
+maTabs[nNewPos]-SetLoadingRTL(maTabs[nOldPos]-IsLoadingRTL());
}
else
SetAutoCalc( bOldAutoCalc );
@@ -948,6 +952,10 @@ sal_uLong ScDocument::TransferTab( ScDocument* pSrcDoc,
SCTAB nSrcPos,
pSrcDoc-GetName(nSrcPos, aName);
CreateValidTabName(aName);
bValid = InsertTab(nDestPos, aName);
+
+// Copy the RTL settings
+
maTabs[nDestPos]-SetLayoutRTL(pSrcDoc-maTabs[nSrcPos]-IsLayoutRTL());
+
maTabs[nDestPos]-SetLoadingRTL(pSrcDoc-maTabs[nDestPos]-IsLoadingRTL());
}
else// bestehende Tabelle ersetzen
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: afms/README apple_remote/README beanshell/README cppunit/README epm/README hsqldb/README hyphen/README icc/README libwpd/README libwpg/README libwps/README libxmlsec/README li
afms/README |1 + apple_remote/README |1 + beanshell/README |4 cppunit/README|3 +++ epm/README|3 +++ hsqldb/README |5 + hyphen/README |1 + icc/README| 22 ++ libwpd/README |1 + libwpg/README |1 + libwps/README |1 + libxmlsec/README | 34 ++ libxmlsec/readme.txt | 32 lpsolve/README|1 + lucene/README |1 + mdds/README |1 + mysqlcppconn/README |1 + mythes/README |1 + np_sdk/README |1 + openssl/README|7 +++ redland/README| 19 +-- rhino/README |6 -- sane/README |1 + twain/README |1 + unixODBC/README |1 + vigra/README |1 + x11_extensions/README |1 + xsltml/README |4 ++-- 28 files changed, 98 insertions(+), 58 deletions(-) New commits: commit dd929dd089abb86bc2206bc9749722682c70f3f1 Author: Josh Heidenreich josh.sickm...@gmail.com Date: Thu Feb 9 13:42:42 2012 +1030 Added and improved READMEs for modules whihc used to be in libs-extern diff --git a/afms/README b/afms/README new file mode 100644 index 000..5bf --- /dev/null +++ b/afms/README @@ -0,0 +1 @@ +External library. diff --git a/apple_remote/README b/apple_remote/README new file mode 100644 index 000..8705e88 --- /dev/null +++ b/apple_remote/README @@ -0,0 +1 @@ +Adds support for the Apple Remote (a remote control) to control Impress. diff --git a/beanshell/README b/beanshell/README new file mode 100644 index 000..0b03fd3 --- /dev/null +++ b/beanshell/README @@ -0,0 +1,4 @@ +Java interpreter from [http://www.beanshell.org/] with some patches. + +So you can write java in command shell; interactive java good for prototyping/macros. + diff --git a/cppunit/README b/cppunit/README new file mode 100644 index 000..f71c260 --- /dev/null +++ b/cppunit/README @@ -0,0 +1,3 @@ +C++ port of the JUnit framework for unit testing. + +From [http://sourceforge.net/projects/cppunit/] diff --git a/epm/README b/epm/README new file mode 100644 index 000..c3ec298 --- /dev/null +++ b/epm/README @@ -0,0 +1,3 @@ +Enhanced Package Manager, From [http://freshmeat.net/projects/epm] + +Nasty hack for packaging, not useful, but default build uses, every linux packager disables this. diff --git a/hsqldb/README b/hsqldb/README new file mode 100644 index 000..8e43980 --- /dev/null +++ b/hsqldb/README @@ -0,0 +1,5 @@ +Java database engine from [http://hsqldb.org/]. + +Default database format for OpenOffice.org. +Also used in LibreOffice but shall be replaced as default by SQLite. + diff --git a/hyphen/README b/hyphen/README new file mode 100644 index 000..327b5b6 --- /dev/null +++ b/hyphen/README @@ -0,0 +1 @@ +Hyphenator library from [http://hunspell.sourceforge.net] diff --git a/icc/README b/icc/README index 672371d..0c1a730 100644 --- a/icc/README +++ b/icc/README @@ -1,15 +1,16 @@ -Date: 2008-01-11 +Library used to build the sRGB profile for PDF/A-1a export with patches. This project is used to generate the ICC color profile needed in module vcl in order to export to PDF/A-1a. -It's composed of a small application, which lurks in: -icc/source/create_sRGB_profile +It's composed of a small application, which lurks in: +[git:icc/source/create_sRGB_profile] That application links to a support library (icc/download/SampleICC-1.3.2), build at OOo build time. + Finally, the application is run at OOo build time to generate the only file delivered to solver: sRGB-IEC61966-2.1.hxx. @@ -17,23 +18,20 @@ sRGB-IEC61966-2.1.hxx. If you need to change the data into the ICC profile, please change the create_sRGB_profile. -The library was downloaded from: -http://sampleicc.sourceforge.net -on 2007-08-23. +The library was downloaded from [http://sampleicc.sourceforge.net] on 2007-08-23. For information on ICC profiles, you may want to visit: -http://www.color.org +[http://www.color.org] -Notes for porters -= -the endianess and other platform specific configuration +== Notes for porters == + +Ehe endianess and other platform specific configuration are in: -build/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h +icc/build/misc/build/SampleICC-1.3.2/IccProfLib/IccProfLibConf.h The patchs: SampleICC-1.3.2.patch tweaks the build to use the endianness detected in sal. beppe...@openoffice.org - diff --git a/libwpd/README b/libwpd/README new file mode 100644 index 000..2cc9c8a --- /dev/null +++ b/libwpd/README @@ -0,0 +1 @@ +From [http://libwpd.sourceforge.net/]. Not modified. WordPerfect filter - SAX api - emits callbacks when things happen. diff --git a/libwpg/README b/libwpg/README new file mode 100644 index 000..19a154d --- /dev/null +++ b/libwpg/README
[PATCH] fdo#45117 - Input window to ask if save in docx or odf format looks unequilibrated
Hi, This patch fixes the problem listed in the bug. It adjusts the width of the dialog to be wider, if required. This is one of the bugs listed in LibO most annoying bugs 3.5 (fdo#37361), so I guess this patch should go into 3.5 as well. Cheers, Josh 0001-Fix-fdo-45117-Alien-save-dialog-buttons-run-off-the-.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
opengrok not updated?
Hello all, I've noticed that the opengrok [1] hasn't been updated for a while. IMHO the cause is the cgit failure last week. [1] http://opengrok.libreoffice.org/ Although the date at the footer says Indexes created Tue Feb 07 00:44:22 CET 2012, but I've seen these: 1. sc/source/ui/view/output.cxx, history at [2], tells that last modified date is 5 days ago (2012-02-03), but opengrok says 27-Nov-2011 [3] [2] http://cgit.freedesktop.org/libreoffice/core/log/sc/source/ui/view/output.cxx [3] http://opengrok.libreoffice.org/history/core/sc/source/ui/view/output.cxx 2. solenv/bin/build.pl, history at [4], tells that last modified date is 2 days ago (2012-02-06), but opengrok says 13-Dec-2011 [5] [4] http://cgit.freedesktop.org/libreoffice/core/log/solenv/bin/build.pl [5] http://opengrok.libreoffice.org/history/core/solenv/bin/build.pl Could someone please have a look? Thanks! :-) Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] fix RTF import of PNG images with bogus width/height
Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=66fa759bb6d8199404b482512d7609ba47265ae8 It fixes a regression from the old filter, which ignored PNG image width/height values. Could somebody sign-off and push to -3-5, please? Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW 3-5][PUSHED] fix RTF import of PNG images with bogus width/height
Hello Miklos, On Wed, 2012-02-08 at 09:36 +0100, Miklos Vajna wrote: See http://cgit.freedesktop.org/libreoffice/core/commit/?id=66fa759bb6d8199404b482512d7609ba47265ae8 It fixes a regression from the old filter, which ignored PNG image width/height values. Could somebody sign-off and push to -3-5, please? The patch looks good to me. Pushed it. -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How far can the LO file's contents be stretched?
On Mon, 2012-02-06 at 23:32 +0100, Michael Stahl wrote: flat ODF filters don't support all features of package-based ODF (which is i guess the reason why OOo never shipped a flat ODF filter out of the box); also your images and embedded objects will blow up considerably in size due to base64 encoding. Que ? really ? why is that ? base64 encoding should increase the size of a binary object or image by only 30% or so - surely ? I was labouring under the impression that these were semantically and content-wise identical - why should that not be so ? :-) All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
basegfx::fround and friends seems needed in windows build
Hello Alexander, Caolán, all, Regarding recent voreppe tinderbox failure [1], it seems that at least 2 methods are needed: * basegfx::unotools::UnoPolyPolygon::getPolyPolygonUnsafe() const * basegfx::fround -- I'm not sure whether we need all 3 overloaded methods which I found that they've been deleted as part of unusedcode.easy clean-up commit [2]. What should we do next? (partially) revert it? or ...? :-) [1] http://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTERbrief-log=1328681401.30516#err592 [2] http://cgit.freedesktop.org/libreoffice/core/commit/?id=b3c3e116ff0eb9b550b73d3901395c042e31d192 Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[IMPORTANT] Where to report SPAM going to this list
Hi all, Please report SPAM that occasionally goes to this list only to: libreoffice-ow...@lists.freedesktop.org and we will take care of that. Never report to PDX or spamcop, that may lead to blacklisting the entire list which is for sure something you do not want ;-) Please remember this, and tell others too. I am sorry for the trouble, but be assured that the spam that occasionally gets through is just a tiny fraction of what we filter out / moderate. Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How far can the LO file's contents be stretched?
On 08/02/12 10:16, Michael Meeks wrote: On Mon, 2012-02-06 at 23:32 +0100, Michael Stahl wrote: flat ODF filters don't support all features of package-based ODF (which is i guess the reason why OOo never shipped a flat ODF filter out of the box); also your images and embedded objects will blow up considerably in size due to base64 encoding. Que ? really ? why is that ? base64 encoding should increase the size of a binary object or image by only 30% or so - surely ? well i'd say 30% counts as significantly for a file format (plus of course the XML content is not compressed, and that stuff tends to compress quite well). I was labouring under the impression that these were semantically and content-wise identical - why should that not be so ? :-) there are various features that require packages (encryption, signatures), some that could perhaps be made to work with flat files if somebody would put in the effort to work out how (RDF metadata), and some that could almost certainly work but just aren't implemented (e.g. embedded media files in LO 3.5). All the best, Michael. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] x11 / cairo-less build try #2
Hi Matúš, Il 07/02/2012 23:57, Matúš Kukan ha scritto: Hello there, On 7 February 2012 18:19, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: I've progressed a bit with X11 / cairo less build. Now everything builds but somethings chokes in make dev-install: http://pastebin.com/qsi0wPFR Where are these missing files listed? I suppose i have to add some conditionals. git grep for them in scp2/ Only type the base of the name: 'git grep acc | grep LIB' .. or 'git grep acc | grep RES' for .res file If someone is so keen to take a look at the patches and point out what could be improved, uneeded changes (RepositoryModule_ooo.mk?) it'll be great. Seems like RepositoryModule_ooo.mk is used only when running 'make check'. I don't think you need to change it. Will try without changes there. Are you sure you want to change GUIBASE ? I am not sure about anything :) I think i need to follow unx as close as possible, cloning GUIBASE seemed reasonable, i'm open to everything that fits better. For example missing files: spadmin, spaen-US.res.. are from padmin/ module and there is ifeq ($(GUIBASE),unx) in Module_padmin.mk I'm not sure i want this stuff since it looks like to need CUPS related stuff. Thanks! -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
config_host doesn't set $PATH
Hello Norbert, all, First of all, thanks for your work regarding killing the Env.host.sh :-) Anyway, it doesn't set $PATH - the environment variables - like Env.host.sh did in the past, at least in cygwin. In Env.host.sh, $PATH is created from set_soenv.in, setting the path to msvc binaries before /usr/bin/*. That is, when calling `link`, it would execute the msvc linker. But now it will execute gnu linker, which is incorrect and break my build. Is this intended? If yes, I have to set the $PATH manually, right? Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: basegfx::fround and friends seems needed in windows build
On 02/08/2012 10:30 AM, Korrawit Pruegsanusak wrote: What should we do next? (partially) revert it? or ...? :-) Yes, please just revert what is used by Windows-only canvas/source/directx but got erroneously removed. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Please remove obsolete files (?) in dev-www/bundles
Hello all, In http://dev-www.libreoffice.org/bundles/ IMHO there are 2 obsoleted files: [ ] libreoffice-git.tar.bz2 14-Aug-2011 03:00 642M [ ] libreoffice-extra-git.tar.bz214-Aug-2011 03:07 291M If they are really obsoleted, they should be removed. But if not, sorry for the noise. Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] convert detdata.cxx in SC module to std::vector
Hi
Attached path converts usage of SV_DECL_PTRARR_DEL in sc/inc/detdata.hxx
and associated code to std::vector.
Code is contributed under MPL+/LGPL+/GPL+
Regards, Noel Grandin
Disclaimer: http://www.peralex.com/disclaimer.html
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx
index 811dde8..9697679 100644
--- a/sc/inc/detdata.hxx
+++ b/sc/inc/detdata.hxx
@@ -35,10 +35,6 @@
//
-
-#define SC_DETOP_GROW 4
-
-//
enum ScDetOpType
{
SCDETOP_ADDSUCC,
@@ -78,18 +74,17 @@ public:
// list of operators
//
-typedef ScDetOpData* ScDetOpDataPtr;
-
-SV_DECL_PTRARR_DEL(ScDetOpArr_Impl, ScDetOpDataPtr, SC_DETOP_GROW)
+typedef std::vectorScDetOpData* ScDetOpDataVector;
-class ScDetOpList : public ScDetOpArr_Impl
+class ScDetOpList
{
sal_BoolbHasAddError; // updated in append
+ ScDetOpDataVector aDetOpDataVector;
public:
ScDetOpList() : bHasAddError(false) {}
ScDetOpList(const ScDetOpList rList);
-~ScDetOpList() {}
+~ScDetOpList();
voidDeleteOnTab( SCTAB nTab );
voidUpdateReference( ScDocument* pDoc, UpdateRefMode eUpdateRefMode,
@@ -97,9 +92,12 @@ public:
sal_Booloperator==( const ScDetOpList r ) const; // for ref-undo
-voidAppend( ScDetOpData* pData );
+void Append( ScDetOpData* pData );
+ ScDetOpData* GetObject(int i) const;
+ void DeleteAndDestroy(int i);
sal_BoolHasAddError() const { return bHasAddError; }
+ int Count() const { return aDetOpDataVector.size(); }
};
diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx
index 17f6e32..28c5236 100644
--- a/sc/source/core/tool/detdata.cxx
+++ b/sc/source/core/tool/detdata.cxx
@@ -37,18 +37,19 @@
//
-SV_IMPL_PTRARR( ScDetOpArr_Impl, ScDetOpDataPtr );
-
-//
-
ScDetOpList::ScDetOpList(const ScDetOpList rList) :
-ScDetOpArr_Impl(),
bHasAddError( false )
{
sal_uInt16 nCount = rList.Count();
for (sal_uInt16 i=0; inCount; i++)
-Append( new ScDetOpData(*rList[i]) );
+Append( new ScDetOpData(*rList.GetObject(i)) );
+}
+
+ScDetOpList::~ScDetOpList()
+{
+for(ScDetOpDataVector::iterator it = aDetOpDataVector.begin(); it !=
aDetOpDataVector.end(); ++it)
+ delete *it;
}
void ScDetOpList::DeleteOnTab( SCTAB nTab )
@@ -58,8 +59,8 @@ void ScDetOpList::DeleteOnTab( SCTAB nTab )
{
// look for operations on the deleted sheet
-if ( (*this)[nPos]-GetPos().Tab() == nTab )
-Remove(nPos);
+if ( GetObject(nPos)-GetPos().Tab() == nTab )
+DeleteAndDestroy(nPos);
else
++nPos;
}
@@ -71,7 +72,7 @@ void ScDetOpList::UpdateReference( ScDocument* pDoc,
UpdateRefMode eUpdateRefMod
sal_uInt16 nCount = Count();
for (sal_uInt16 i=0; inCount; i++)
{
-ScAddress aPos = (*this)[i]-GetPos();
+ScAddress aPos = GetObject(i)-GetPos();
SCCOL nCol1 = aPos.Col();
SCROW nRow1 = aPos.Row();
SCTAB nTab1 = aPos.Tab();
@@ -85,7 +86,7 @@ void ScDetOpList::UpdateReference( ScDocument* pDoc,
UpdateRefMode eUpdateRefMod
rRange.aEnd.Col(), rRange.aEnd.Row(), rRange.aEnd.Tab(), nDx,
nDy, nDz,
nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
if ( eRes != UR_NOTHING )
-(*this)[i]-SetPos( ScAddress( nCol1, nRow1, nTab1 ) );
+GetObject(i)-SetPos( ScAddress( nCol1, nRow1, nTab1 ) );
}
}
@@ -94,7 +95,7 @@ void ScDetOpList::Append( ScDetOpData* pDetOpData )
if ( pDetOpData-GetOperation() == SCDETOP_ADDERROR )
bHasAddError = sal_True;
-Insert( pDetOpData, Count() );
+Append( pDetOpData );
}
@@ -105,12 +106,26 @@ sal_Bool ScDetOpList::operator==( const ScDetOpList r )
const
sal_uInt16 nCount = Count();
sal_Bool bEqual = ( nCount == r.Count() );
for (sal_uInt16 i=0; inCount bEqual; i++) // Reihenfolge muss
auch gleich sein
-if ( !(*(*this)[i] == *r[i]) ) // Eintraege
unterschiedlich ?
+if ( !(*(GetObject(i)) == *(r.GetObject(i))) ) //
Eintraege unterschiedlich ?
bEqual = false;
return bEqual;
}
+ScDetOpData* ScDetOpList::GetObject(int i) const
+{
+ return aDetOpDataVector[i];
+}
+
+void ScDetOpList::DeleteAndDestroy(int i)
+{
+ ScDetOpData* p = aDetOpDataVector[i];
+ if (p != NULL)
+ {
+ delete p;
+ aDetOpDataVector.erase(aDetOpDataVector.begin() + i);
+ }
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docfunc.cxx
Re: [Libreoffice-qa] Issues with 3.5.0 - ready for release ...
On Tue, 2012-02-07 at 22:05 +0100, Markus Mohrhard wrote: But keep in mind that this is nothing that will be fast. I needed around one week to check a bit more than 4000 files My times are dramatically faster than this for .doc files in writer at least. I can load 4000 .doc files *under valgrind* overnight in about 10 hours. So apparently mileage varies quite a bit depending on hardware and file format and debugging level. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Issues with 3.5.0 - ready for release ...
2012/2/8 Caolán McNamara caol...@redhat.com: On Tue, 2012-02-07 at 22:05 +0100, Markus Mohrhard wrote: But keep in mind that this is nothing that will be fast. I needed around one week to check a bit more than 4000 files My times are dramatically faster than this for .doc files in writer at least. I can load 4000 .doc files *under valgrind* overnight in about 10 hours. So apparently mileage varies quite a bit depending on hardware and file format and debugging level. That only works if you have no crashs or looping documents. Especially looping is a big problem in calc. Then if we want to be fast using a debug/dbgutil build is the wrong way but then we loose the advantages of gcc's safe iterators. So I think 4000 known good documents can be easily tested in one day or even faster with a decent machine but taking 4000 random documents from bugzilla needs some manual interaction and therefore will need more time. As mentionend in the last mail, I think we could speed that up by copying the test code and the makefile several times and run the test in parallel. That way we could use more cores and would be more reliable against crashs. ( we should of course not commit this stuff then) Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] Missing cliureversion.mk prevents installation while building smoketestoo_native
Hi Kyle,
Better late than never.
Kyle Kurtenbach píše v Ne 29. 01. 2012 v 19:54 -0800:
I was compiling libreoffice to fix some bugs and my build stops
because of an error in smoketestoo_native.
I'm running Ubuntu 10.04 x64.
The build stops because Include file cliureversion.mk is not found.
This error occurs on line 120 of $loroot/solenv/bin/ooinstall when
that script calls {SOLARENV}/bin/make_installer.pl
makeinstaller.pl dies
calling
installer::worker::add_variables_from_inc_to_hashref($allvariableshashref,
$includepatharrayref);
This occurs on Master and the 3.5 release branch.
Do you still see the problem?
Any advice on how to move forward would be greatly appreciated.
The file should be built inside cli_ure/version. It seems that it should
always be built.
Please, check if you have cli_ure/unxlng?6.pro/bin/cliureversion.mk and
solver/unxlng?6.pro/bin/cliureversion.mk
BTW: What configure options you are using?
Best Regards,
Petr
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Lots of module READMEs; libs-core, libs-gui, components, filter, base, calc
Hi Josh, On Wed, 2012-02-08 at 17:24 +1030, Josh Heidenreich wrote: Cool so I'm re-running the tool again at the moment, but it will be done in a couple of minutes. Nice work :-) You can see the result here: http://thejosh.info/libreoffice/module_readmes/ Looks lovely; incidentally - if you parse the first line of the */prj/build.lst files - it gives you a dependency list of the modules that are required by this module :-) [ though that may go obsolete in the next year or so ]. Might be interesting to provide to give a flavour of whether a package is a leaf-node ? etc. I really like the links to cgit, it starts to make it rather nicely integrated :-) It makes me wonder if we should have some nice syntax for cross-module linking (or simplified file path links that can be turned into cgit URLs) in the README's themselves ;-) [ if it's not broken, it doesn't have enough features yet ]. As another wish - I wonder if we can link modules into the http://docs.libreoffice.org/ doxygen documentation (that is if they have any) - and assuming that is even the up-to-date place to find things :-) Anyhow, you inspired me to add and expand a few more READMEs myself, hope that helps a bit. I imagine that a lot of the 'libfoo' things missing READMEs, can be populated with information from the download pages, and a quick grep of */prj/build.lst to see which modules use them. There was also some one-liner descriptions of some of that stuff here: http://www.openoffice.org/external/ in the past :-) Really encouraged by your work, good stuff, Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] unusedcode.easy: Removed unused code (linguistic)
---
linguistic/inc/linguistic/misc.hxx |6
linguistic/source/misc.cxx | 51
unusedcode.easy|5 ---
3 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/linguistic/inc/linguistic/misc.hxx
b/linguistic/inc/linguistic/misc.hxx
index da24159..ee41fe4 100644
--- a/linguistic/inc/linguistic/misc.hxx
+++ b/linguistic/inc/linguistic/misc.hxx
@@ -139,16 +139,10 @@ LNG_DLLPUBLIC sal_Int32 GetPosInWordToCheck( const
rtl::OUString rTxt, sal_Int3
LNG_DLLPUBLIC sal_BoolIsUpper( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int16 nLanguage );
-LNG_DLLPUBLIC sal_BoolIsLower( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int16 nLanguage );
inline sal_BoolIsUpper( const String rText, sal_Int16 nLanguage )
{ return IsUpper( rText, 0, rText.Len(), nLanguage ); }
-inline sal_BoolIsLower( const String rText, sal_Int16 nLanguage )
{ return IsLower( rText, 0, rText.Len(), nLanguage ); }
String ToLower( const String rText, sal_Int16 nLanguage );
-String ToUpper( const String rText, sal_Int16 nLanguage );
-String ToTitle( const String rText, sal_Int16 nLanguage );
-sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage );
-sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage );
LNG_DLLPUBLIC sal_Bool HasDigits( const ::rtl::OUString rText );
LNG_DLLPUBLIC sal_Bool IsNumeric( const String rText );
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index 4927b4e..59c3f37 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -635,18 +635,6 @@ sal_Bool IsUpper( const String rText, xub_StrLen nPos,
xub_StrLen nLen, sal_Int
}
-sal_Bool IsLower( const String rText, xub_StrLen nPos, xub_StrLen nLen,
sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-sal_Int32 nFlags = rCC.getStringType( rText, nPos, nLen );
-return (nFlags KCharacterType::LOWER)
- !(nFlags KCharacterType::UPPER);
-}
-
-
String ToLower( const String rText, sal_Int16 nLanguage )
{
MutexGuard aGuard( lcl_GetCharClassMutex() );
@@ -657,45 +645,6 @@ String ToLower( const String rText, sal_Int16 nLanguage )
}
-String ToUpper( const String rText, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.uppercase( rText );
-}
-
-
-String ToTitle( const String rText, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.titlecase(rText);
-}
-
-
-sal_Unicode ToLower( const sal_Unicode cChar, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.lowercase( rtl::OUString(cChar) )[0];
-}
-
-
-sal_Unicode ToUpper( const sal_Unicode cChar, sal_Int16 nLanguage )
-{
-MutexGuard aGuard( lcl_GetCharClassMutex() );
-
-CharClass rCC = lcl_GetCharClass();
-rCC.setLocale( CreateLocale( nLanguage ) );
-return rCC.uppercase( rtl::OUString(cChar) )[0];
-}
-
// sorted(!) array of unicode ranges for code points that are exclusively(!)
used as numbers
// and thus may NOT not be part of names or words like the Chinese/Japanese
number characters
static const sal_uInt32 the_aDigitZeroes [] =
diff --git a/unusedcode.easy b/unusedcode.easy
index 5a67cee..6e6303b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1285,11 +1285,6 @@
libcmis::SessionFactory::getRepositories(std::__debug::mapint, std::basic_strin
libvisio::VisioDocument::generateSVG(WPXInputStream*, WPXString)
libwpg::WPGraphics::generateSVG(unsigned char const*, unsigned long,
WPXString, libwpg::WPGFileFormat)
libwpg::WPGraphics::parse(unsigned char const*, unsigned long,
libwpg::WPGPaintInterface*, libwpg::WPGFileFormat)
-linguistic::IsLower(String const, unsigned short, unsigned short, short)
-linguistic::ToLower(unsigned short, short)
-linguistic::ToTitle(String const, short)
-linguistic::ToUpper(String const, short)
-linguistic::ToUpper(unsigned short, short)
nullcanvas::CanvasFont::getFontMatrix() const
nullcanvas::CanvasHelper::flush() const
nullcanvas::CanvasHelper::getPalette()
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Issues with 3.5.0 - ready for release ...
On Wed, 8 Feb 2012, Markus Mohrhard wrote: 2012/2/8 Caolán McNamara caol...@redhat.com: On Tue, 2012-02-07 at 22:05 +0100, Markus Mohrhard wrote: But keep in mind that this is nothing that will be fast. I needed around one week to check a bit more than 4000 files My times are dramatically faster than this for .doc files in writer at least. I can load 4000 .doc files *under valgrind* overnight in about 10 hours. So apparently mileage varies quite a bit depending on hardware and file format and debugging level. That only works if you have no crashs or looping documents. Especially looping is a big problem in calc. Then if we want to be fast using a debug/dbgutil build is the wrong way but then we loose the advantages of gcc's safe iterators. So I think 4000 known good documents can be easily tested in one day or even faster with a decent machine but taking 4000 random documents from bugzilla needs some manual interaction and therefore will need more time. As mentionend in the last mail, I think we could speed that up by copying the test code and the makefile several times and run the test in parallel. That way we could use more cores and would be more reliable against crashs. ( we should of course not commit this stuff then) I would investigate in what cloudooo is doing, they already monitor the process and detect a runaway/memory-leaked process, or intervene when a conversion is spending more time than we would expect. If we simply implement his logic in a small python tool and make it work on a directory of documents, we could run this command every night using the latest snapshot and record/log any debug output (in parallel if need be). And if we use the same (growing) set of documents we also test for regressions by having a directory of files that never failed, and a directory with files that have failed, and have the tool move the files around. And in the same time the robustness of the UNO python bindings is tests ;-) PS I would add cloudooo logic to unoconv, but I prefer to keep workarounds out of unoconv, as I prefer such errors to be reported rather than hide them from users. -- -- dag wieers, d...@wieers.com, http://dag.wieers.com/ -- dagit linux solutions, i...@dagit.net, http://dagit.net/ [Any errors in spelling, tact or fact are transmission errors]___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED-partially][PATCH]a better about dialog
Noel Power píše v Čt 02. 02. 2012 v 16:33 +: Hi Barış On 02/02/12 12:22, Noel Power wrote: Hi Barış looks really nice, I will push it ( or maybe someone else will before So I am partially pushing the content of the patch, mostly it is the same except for the width change, instead I put the links vertically ( not ideal either imo ) [ see attached image ]. Hopefully some on the list will jump in to help guide you to make it more lovely ( 'afraid I'm not too much help ). Anyway, didn't want your contribution to go to waste so consider this first iteration a start. http://cgit.freedesktop.org/libreoffice/core/commit/?id=dde025efacba24edc700989a357c5fddbb0e4886 So the screenshot http://lists.freedesktop.org/archives/libreoffice/attachments/20120202/d60c73ff/attachment-0001.png looks nice and is definitely a nice step forward. I have just two thoughts. I would suggest to center also the build version and build id. It looks weird when just these two lines are not centered. Also I am not sure whether the following change is desired: --- cut --- - Text[ en-US ] = This product was supplied by %OOOVENDOR.; + Text[ en-US ] = %PRODUCTNAME is a free and open source office suite developed by %OOOVENDOR. ; --- cut --- Note that the %OOOVENDOR might be also Red Hat, Ximian, SUSE for the distro specific builds. They provide the build (maybe with some modifications) but they do not develop the whole suite. Michael, what do you think? Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][patch] tools/table.hxx to std::map conversion in SV, SVL and SVX modules
Hi Noel, On Monday, 2012-02-06 14:50:59 +0200, Noel Grandin wrote: This patch converts one use of tools/table.hxx in svl/inc/svl/zforlist.hxx, whose use in turn spans 3 modules. Pushed to master http://cgit.freedesktop.org/libreoffice/core/commit/?id=0979307bbf769399f97da10a29f04936a6cf117c For my changes and nitpicks ;) please see http://cgit.freedesktop.org/libreoffice/core/commit/?id=9472e9c77d55a0b9cdf75ce91375765243c0e1f1 Some are substantial, as calling clear() when necessary or using the iterator post-increment on erase(). Code is contributed under MPL+/LGPL+/GPL+ I assume you meant LGPLv3+ and MPL 1.1 or later. You may also want to add yourself to https://wiki.documentfoundation.org/Development/Developers and in the License column point to a mail in the archive that has a blanket statement that all your patches are under these licenses, which eliminates the need of marking each single one. Code has passed make check. Great you use that! Thanks again Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpjOvaRkyZFz.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Android design?
Hi Mirek, Michael, Anyhow - thanks for getting involved ! I look forward to what you come up with. Hehe. Take a look at the amazing mock-up and ideas that Mirek has been working on for a while now: http://clickortap.wordpress.com/frivl/ (No, none of this is perfectly specced out yet, but there's some pretty cool stuff there.) Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 43644, which changed state. Bug 43644 Summary: Document Converter doesn't work without 'Legacy Filters' https://bugs.freedesktop.org/show_bug.cgi?id=43644 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Moderator / maintainer for FDO Bugzilla ?
Hi all, I've been trying to change my options in the FDO bugzilla, so that : (1) I don't get an e-mail every time someone creates a new bug report (2) any e-mail I do get, is sent to a new e-mail address In order to change (1), I have logged in on several occasions, navigated to the options page and changed the preferences in the e-mail notifications page, then saved. However, no matter what I do, none of the changes remain set. Whenever I log back in again, I see that the e-mail tick boxes are all set once again. This is most annoying. In order to change (2), I logged in and was able to change my e-mail contact address, and save it. I also got a confirmatory e-mail at my old e-mail address and my new e-mail address stating that the change would be effective within 3 days - I naturally confirmed the change, but the e-mails are still getting sent to my old e-mail address, whereas my login e-mail has effectively changed. It has also now been more that 4 days since I requested the change. Who am I supposed to contact so that I get all this sorted out for good, once and for all ? Alex ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] [REVIEW:3-5] postgresql compatibility with 8.4
Attached patch restores compatibility of PostgreSQL-SDBC with
PostgreSQL server version 8.4. LibO 3.5.0 accidentally works only with
9.0 and later. (9.0 came after 8.4, there is no 8.5.)
Basically, it replaces try to be extra-smart and look directly into
the PostgreSQL internals by get information from the view PostgreSQL
provides for this purpose. Because this view is buggy, it still goes
look directly in the PostgreSQL internals to work around that bug
(which has been fixed in their development branch, PostgreSQL 9.2),
but not in a way that breaks compatibility with PostgreSQL 8.4.
Please apply to libreoffice-3-5.
Thanks!
--
Lionel
From 8c922d832792402554cc3dfd174d6d4da50847f4 Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane lio...@mamane.lu
Date: Wed, 1 Feb 2012 16:40:13 +0100
Subject: [PATCH] fdo#45254 pgsql getTablePrivileges: rely on information_schema
This avoids the use of aclexplode(), which is only SQL-available in PostgreSQL 9.0 and later.
With PostgreSQL versions known to have the information_schema.table_privileges bug of not filling in the default ACL in the absence of an ACL, fill in owner has all rights, which is the default state of the default ACL.
---
.../drivers/postgresql/pq_databasemetadata.cxx | 73 ---
1 files changed, 31 insertions(+), 42 deletions(-)
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index d26b150..d2e4927 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1706,49 +1706,38 @@ static void columnMetaData2DatabaseTypeDescription(
log( m_pSettings, LogLevel::INFO, buf.makeStringAndClear() );
}
-Reference XPreparedStatement statement = m_origin-prepareStatement(
-ASCII_STR(
- WITH RECURSIVE roles AS (
- SELECT oid, rolname, rolinherit, rolsuper FROM pg_catalog.pg_roles
-UNION ALL
- VALUES (0, 'PUBLIC', TRUE, FALSE)
- ), direct_privs_oids AS (
- SELECT c.relname, c.relnamespace, c.relowner, (aclexplode(c.relacl)).*
- FROM pg_catalog.pg_class c
- WHERE c.relkind IN ('r', 'v') AND c.relname LIKE ?
-UNION ALL
- SELECT c.relname, c.relnamespace, c.relowner, c.relowner, c.relowner, p.privilege, TRUE
- FROM pg_catalog.pg_class c,
- (VALUES ('SELECT'), ('INSERT'), ('UPDATE'), ('DELETE'), ('TRUNCATE'), ('REFERENCES'), ('TRIGGER')) p (privilege)
- WHERE c.relkind IN ('r', 'v') AND c.relacl IS NULL AND c.relname LIKE ?
- ), direct_privs AS (
-SELECT dpo.relname, pn.nspname, dpo.relowner, pr_grantor.rolname AS grantor, dpo.grantee, dpo.privilege_type, dpo.is_grantable
-FROM direct_privs_oids dpo INNER JOIN roles pr_grantor ON dpo.grantor = pr_grantor.oid
- INNER JOIN pg_catalog.pg_namespace pn ON pn.oid = dpo.relnamespace
-WHERE pn.nspname LIKE ?
- ), memberships(roleid, membership) AS (
- SELECT pr.oid, 0
- FROM pg_catalog.pg_roles pr
-UNION
- SELECT pr.oid, pr.oid
- FROM roles pr
-UNION
- SELECT m.roleid, pam.roleid
- FROM roles pr INNER JOIN pg_catalog.pg_auth_members pam ON pr.oid = pam.member
- INNER JOIN memberships m ON pam.member = m.membership
- WHERE pr.rolinherit
- )
- SELECT current_database() AS TABLE_CAT, dp.nspname AS TABLE_SCHEM, dp.relname AS TABLE_NAME,
- dp.grantor AS GRANTOR, pr_grantee.rolname AS GRANTEE, dp.privilege_type AS PRIVILEGE,
- CASE WHEN dp.is_grantable OR (dp.relowner = pr_grantee.oid) THEN 'YES' ELSE 'NO' END AS IS_GRANTABLE
- FROM direct_privs dp INNER JOIN memberships m ON dp.grantee = m. membership
- INNER JOIN roles pr_grantee ON pr_grantee.oid = m.roleid
- ORDER BY dp.nspname, dp.relname, dp.privilege_type
-));
+rtl::OUStringBuffer sSQL(260);
+sSQL.append( ASCII_STR(
+ SELECT * FROM (
+ SELECT table_catalog AS TABLE_CAT, table_schema AS TABLE_SCHEM, table_name,
+ grantor, grantee, privilege_type AS PRIVILEGE, is_grantable
+ FROM information_schema.table_privileges) );
+if ( PQserverVersion( m_pSettings-pConnection ) 90200 )
+// information_schema.table_privileges does not fill in default ACLs when no ACL
+// assume default ACL is owner has all privileges and add it
+sSQL.append( ASCII_STR(
+ UNION
+ SELECT current_database() AS TABLE_CAT, pn.nspname AS TABLE_SCHEM, c.relname AS TABLE_NAME,
+
Re: PATCH build errors on Ubuntu 10.04
On Sun, Feb 05, 2012 at 03:18:13PM -0600, Norbert Thiebaud wrote: On Sun, Feb 5, 2012 at 12:05 PM, Gert van Valkenhoef g.h.m.van.valkenh...@rug.nl wrote: Dear LibreOffice developers, 2) There is no build-dep on doxygen (ppa libreoffice), but LibreOffice won't build without it it will if you specify --without-doxygen but sure, it would be nice if the distribution's dep package would There's no dep package. pull it automatically... (and the wiki should prolly be updated too) No, it does not make sense to add Build-Depends: doxygen on a 3.5 when a 3.5 does not need it. (apt-get build-dep is just a thing looking at Build-Depends: of the libreoffice source package in apts cache) Seriously, if someone can't install doxygen when configure errors out because doxygen is not there... Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#37775 - EasyHack: Recent Documents not updated by Save Save As...
Hello, Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37775 Patch link: https://bugs.freedesktop.org/attachment.cgi?id=56740 Patch Review: https://bugs.freedesktop.org/page.cgi?id=splinter.htmlbug=37775attachment=56740 Changes (copied from patch): This patch changes LO behavior so that we update recent documents on file open, save, save as, save all, and close. The previous behavior was to only update the list on document close. = Changes = SfxPickList (sfxpicklist.cxx/hxx): . Extracted the logic to add a document to the Recent Documents list into a function of its own: AddDocumentToPickList - Simplified the logic used by removing the check of SfxObjectShell_impl::bWaitingForPickList (see SfxObjectShell_impl::bWaitingForPickList below for details) . Modified SfxPickList::Notify to call the aforementioned function on open, save, save-to, and save-as. SfxObjectShell::APISaveAs_Impl (objserv.cxx): . Modified it to allow picklist entry when doing Save As. SfxObjectShell_impl::bWaitingForPickList (objstor.cxx, objxtor.cxx, objshimp.hxx): . Removed this flag. It was used to indicate that a document wants to be added to the picklist, then cleared after it's added. Since we now always add documents to the picklist on saving, we no longer need it. = Verification = The change is in sfx2, so it should apply to all LO apps. I verified the new behavior in both writer and calc with the following actions: . File-Open . Open through File-Recent Documents-File Entry . File-Save . File-Save As . File-Save All . File-Close I tested saving both odt and docx for writer. Regards, --Muhammad ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
On 2012-02-08 14:54, Rene Engelhard wrote: Seriously, if someone can't install doxygen when configure errors out because doxygen is not there... The list of things to do for building LO is pretty steep for a first timer. Individually it may not seem like much, but when you've gone back to searching wiki pages and google for the 20th time, it gets frustrating. It took me 3 weeks of part-time hacking and googling and asking questions on the mailing list to get LO to build. And considerably longer before I had something that would actually run. Perhaps the configure process could just automatically add the correct --without flags if the relevant packages are not present? -- Noel Grandin Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 35669, which changed state. Bug 35669 Summary: Incorrect cross-references to illustrations and equations in master documents https://bugs.freedesktop.org/show_bug.cgi?id=35669 What|Old Value |New Value Resolution||FIXED Status|REOPENED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Please remove obsolete files (?) in dev-www/bundles
Korrawit Pruegsanusak wrote: In http://dev-www.libreoffice.org/bundles/ IMHO there are 2 obsoleted files: [ ] libreoffice-git.tar.bz2 14-Aug-2011 03:00 642M [ ] libreoffice-extra-git.tar.bz214-Aug-2011 03:07 291M If they are really obsoleted, they should be removed. But if not, sorry for the noise. They are for the 3.4 and possibly still helpful for initially cloning that branch - I'm not particularly attached to them, but would suggest to keep them around until 3.4 is closed for maintenance? Cheers, -- Thorsten pgp1IhZ07TrNy.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Lots of module READMEs; libs-core, libs-gui, components, filter, base, calc
Michael Meeks wrote: As another wish - I wonder if we can link modules into the http://docs.libreoffice.org/ doxygen documentation (that is if they have any) - and assuming that is even the up-to-date place to find things :-) The script that generates that load is solenv/bin/mkdocs.sh - would be lovely to have that integrated, yeps. Cheers, -- Thorsten pgpAgLiCXZeAy.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
Hi, On Wed, Feb 08, 2012 at 03:11:18PM +0200, Noel Grandin wrote: On 2012-02-08 14:54, Rene Engelhard wrote: Seriously, if someone can't install doxygen when configure errors out because doxygen is not there... The list of things to do for building LO is pretty steep for a first timer. Individually it may not seem like much, but when you've gone back to searching wiki pages and google for the 20th time, it gets frustrating. Nonssense. What is hard on No doxygen ther. to apt-get install doxygen? Right, nothing. It took me 3 weeks of part-time hacking and googling and asking questions on the mailing list to get LO to build. If there's actual build errors you're right, but not for such trivialities which can be solved by actually reading the error message and installing the missing package. Perhaps the configure process could just automatically add the correct --without flags if the relevant packages are not present? No. Because that can lead to accidentially disabling stuff you want (and you implicitely said I want the full SDK, otherwise you'd have configure'd appropriately) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
On 2012-02-08 15:15, Rene Engelhard wrote: Nonssense. What is hard on No doxygen ther. to apt-get install doxygen? Right, nothing. This is what I get - it needs to do 400M of downloads - please tell me which pieces it needs and does not need. Now multiply this by a dozen other settings, and you begin to see the problem. noel@ubuntu:~/libo$ sudo apt-get install doxygen Reading package lists... Done Building dependency tree Reading state information... Done The following extra packages will be installed: doxygen-latex lacheck latex-beamer latex-xcolor lmodern luatex pgf preview-latex-style prosper ps2eps tex-common texlive-base texlive-binaries texlive-common texlive-doc-base texlive-extra-utils texlive-font-utils texlive-generic-recommended texlive-latex-base texlive-latex-base-doc texlive-latex-extra texlive-latex-extra-doc texlive-latex-recommended texlive-latex-recommended-doc texlive-luatex texlive-pictures texlive-pictures-doc texlive-pstricks texlive-pstricks-doc Suggested packages: doxygen-doc doxygen-gui graphviz auctex perl-tk dvidvi fragmaster latexmk purifyeps xindy psutils t1utils texpower dot2tex The following NEW packages will be installed: doxygen doxygen-latex lacheck latex-beamer latex-xcolor lmodern luatex pgf preview-latex-style prosper ps2eps tex-common texlive-base texlive-binaries texlive-common texlive-doc-base texlive-extra-utils texlive-font-utils texlive-generic-recommended texlive-latex-base texlive-latex-base-doc texlive-latex-extra texlive-latex-extra-doc texlive-latex-recommended texlive-latex-recommended-doc texlive-luatex texlive-pictures texlive-pictures-doc texlive-pstricks texlive-pstricks-doc 0 upgraded, 30 newly installed, 0 to remove and 93 not upgraded. Need to get 417 MB of archives. After this operation, 679 MB of additional disk space will be used. Do you want to continue [Y/n]? Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW][3-5][3-4]Fix for fdo#35669
Hi all, Could someone review, cherry-pick -s the following commit in 3-5 and 3-4? http://cgit.freedesktop.org/libreoffice/core/commit/?id=44f971506c0ed37928c48e55d8007f24b0c43a5f Thanks, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
On Wed, Feb 08, 2012 at 03:26:55PM +0200, Noel Grandin wrote: On 2012-02-08 15:15, Rene Engelhard wrote: Nonssense. What is hard on No doxygen ther. to apt-get install doxygen? Right, nothing. This is what I get - it needs to do 400M of downloads - please tell me which pieces it needs and does not need. Then install doxygen. Anything in depends is needed to get the package installed. Just apt-get install doxygen and you're done. What doxygen itself suggests does not matter. If libreoffice needed anything of that we needed to check for that in any case. Now multiply this by a dozen other settings, and you begin to see the problem. No, I don't. I am not talking about eventual missing checks etc, just about the triviality to match no doxygen found but needed to install doxygen. If that is not enough, yes, we'd need to fix something up, but that's a *completely* different story. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
Hi Noel, *, On Wed, Feb 8, 2012 at 2:26 PM, Noel Grandin n...@peralex.com wrote: On 2012-02-08 15:15, Rene Engelhard wrote: Nonssense. What is hard on No doxygen ther. to apt-get install doxygen? Right, nothing. This is what I get - it needs to do 400M of downloads - please tell me which pieces it needs and does not need. To begin with: You don't need doxygen when you're developing only (i.e. you only need it if you want to publish the built SDK). In fact you don't need to build the SDK/ODK at all (--disable-odk) It only creates the api-documentation html from the sources. If you're fine with reading the docs online or don't care about installing the SDK from our download page to get the API-docs, then you don't need to build it yourself. Now multiply this by a dozen other settings, and you begin to see the problem. I don't know the debian dependencies, but as most of the download in your case is TeX, just leave that out. It only creates html, no tex-documents and stuff that would require tex. I.e. don't include doxygen-latex and the install will be much slimmer - but as mentioned: No idea what package you have to install instead of the meta-package. (just use --without-doxygen or --disable-odk) ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW]Fix for annoying bug fdo#35669
Hi Kendy, all, On Tue, 2012-01-31 at 15:50 +0100, Jan Holesovsky wrote: Looked fine. Worked reasonable = pushed into 3-5-0, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-0id=4632a18dae5e1770aa1da4ac55719a09c1ae461b http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-0id=4925acf5648438589bca74f3dbfc2fc5fc9f61ab The patch improved the situation for sure, so great that you've pushed that, thank you! Unfortunately it hasn't fixed all the corner cases, so I had to reopen the issue + described that; but still, worth having in libreoffice-3-5-0 :-) Could someone cherry-pick this one to 3-4 a well as this is a bug also in that version? Thanks, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to compile Calc
Thank you so much on the clarification. I was trying to get myself involve in the project development. At the very beginning step is to get myself familiar with the code base by working on the bug fixes, but the project is too huge and kind of lose where should I start. Since I have been using a lot of word and calc, thus I was planning to start from Calc project. Initially I really though it was a separate project like Word project, Calc project, Draw project, and many many more project, adding them together will have a big project called LibreOffice. My objective is to fix bugs, my though was if I fix a bug in Calc, I should compile just Calc project rather than to compile the whole thing. Should I compile the whole thing when I fixed a bug in Calc? I heard rumours in OpenOffice saying that if compile the whole thing will take a long time (probably took days to compile) if my computer is using core 2 duo processor. That's why I want to compile individual project rather than compile the whole thing. Anyhow I have i5 with 8GB ram ready, no worry on that. According to the Get-Involve Guide, I should check out the core project. But when I go browse the repo, I saw many other subproject, and then each branch will have sub branches. A little bit confusing because I don't know which branch I should checkout. So which branch I should check out in order for me to fix a bug? In order to compile Calc, any other dependencies project I should checkout as well? According to the Get-Involve Guide, under the section Build and Run it, it didn't mention how to compile Calc. Thus I was a little lose here. THanks @! On Tue, Feb 7, 2012 at 10:42 PM, Tor Lillqvist t...@iki.fi wrote: I have check out a new copy of calc libreoffice-3-4 project There is no separate Calc project that one could build. You have been mislead by the fact that we used to have the source code split up in a bunch of separate Git repositories, one being called calc. That doesn't man one would be able to use just the calc repository to build just Calc. There are 4 sub project inside calc project. There are four *subdirectories*. Your use of the word project is slightly odd. May I know how should I compile in order to have the calc program up? Calc is not a separate program. Firstly, before helping you any further, you should tell us what it is that you actually want to achieve. Do you want to fix some bug or do other improvements? Work on some feature? Or what? Only after you have told that can we tell you whether it indeed makes sense for you to build LibreOffice 3.4, or whether you should work on the upcoming 3.5 version's code, or on the master development branch. (The source code for these is no longer split up into separate Git repositories.) Anyway, welcome to working on LibreOffice, and hopefully your initial confusion will quickly be resolved and you can get on with hacking! --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
Hi. On Wed, Feb 08, 2012 at 02:58:36PM +0100, Christian Lohmaier wrote: Now multiply this by a dozen other settings, and you begin to see the problem. I don't know the debian dependencies, but as most of the download in your case is TeX, just leave that out. It only creates html, no tex-documents and stuff that would require tex. I.e. don't include doxygen-latex and the install will be much slimmer Yes. Especially as doxygen-latex is no depends but only a *recommends*. (Dumbly the default nowadays is to also install recommends per default...) http://packages.debian.org/sid/doxygen Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: basegfx::fround and friends seems needed in windows build
Hello Stephan, On Wed, Feb 8, 2012 at 17:11, Stephan Bergmann sberg...@redhat.com wrote: Yes, please just revert what is used by Windows-only canvas/source/directx but got erroneously removed. Thanks! Done at http://cgit.freedesktop.org/libreoffice/core/commit/?id=a330f38093e2643a26239557050561afae9ff23d Anyway, I don't have a directx sdk to test it, so I just revert only errors mentioned in tinderbox. Let's see if we need more ... :-) Best Regards, -- Korrawit Pruegsanusak ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [REVIEW][3-5][3-4]Fix for fdo#35669
On 08/02/12 14:30, Cedric Bosdonnat wrote: Hi all, Could someone review, cherry-pick -s the following commit in 3-5 and 3-4? http://cgit.freedesktop.org/libreoffice/core/commit/?id=44f971506c0ed37928c48e55d8007f24b0c43a5f makes sense; pushed to libreoffice-3-5: http://cgit.freedesktop.org/libreoffice/core/log/?h=libreoffice-3-5 not signing off for 3-4 because: - code looks rather different there (was apparently STL converted cleaned up for 3.5) - this bug is not a regression (report says it's at least 8 years old) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW]Fix for annoying bug fdo#35669
On 08/02/12 15:05, Cedric Bosdonnat wrote: Hi Kendy, all, On Tue, 2012-01-31 at 15:50 +0100, Jan Holesovsky wrote: Looked fine. Worked reasonable = pushed into 3-5-0, see http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-0id=4632a18dae5e1770aa1da4ac55719a09c1ae461b http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-0id=4925acf5648438589bca74f3dbfc2fc5fc9f61ab The patch improved the situation for sure, so great that you've pushed that, thank you! Unfortunately it hasn't fixed all the corner cases, so I had to reopen the issue + described that; but still, worth having in libreoffice-3-5-0 :-) Could someone cherry-pick this one to 3-4 a well as this is a bug also in that version? as just mentioned in the other thread: not signing off the 3 patches for this bug for 3-4 because: - code looks rather different there (was apparently STL converted cleaned up for 3.5) - this bug is not a regression (report says it's at least 8 years old) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][MASTER][3-5] fdo#45117 - Input window to ask if save in docx or odf format looks unequilibrated
Josh Heidenreich píše v St 08. 02. 2012 v 18:51 +1030: Hi, This patch fixes the problem listed in the bug. It adjusts the width of the dialog to be wider, if required. This is one of the bugs listed in LibO most annoying bugs 3.5 (fdo#37361), so I guess this patch should go into 3.5 as well. Great fix. Works well. I have pushed it into both master and 3-5 branch, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=09be8bbee6b49680dd2a16f5b4c2c2f8d9eca72c http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=cce15c38036c5d7de1405012dc448f3fb3ab3476 Thanks a lot for the patch. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 45117, which changed state. Bug 45117 Summary: Input window to ask if save in docx or odf format looks unequilibrated https://bugs.freedesktop.org/show_bug.cgi?id=45117 What|Old Value |New Value Resolution||FIXED Status|NEW |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: How to compile Calc
It's best to avoid the word project completely as it has so many different meanings. For instance, many people accustomed to using IDEs for all aspects of software development would say a project is something you open in an IDE (like Visual Studio or Xcode) and design, edit, build and debug there. LibreOffice has no such projects. In LibreOffice, the source code is stored in a distributed version control (Git). Git has *repositories*. When you *clone* that (checkout has a slightly different meaning in Git), you get a local repository, and the actual files in a tree with lot of subdirectories. These subdirectories are usually called modules, but don't read too much meaning into that word. Module can mean many different things. In the LibreOffice codebase, a module is simply one of the top-level subdirectories. The code in one module is used to build one or several (shared) libraries (and in some cases, executables). In general, we have too many libraries, and we want to eventually reduce their number a lot. LibreOffice's object system (UNO) has *components*, don't confuse those with the modules. You need to clone the core repository, and build most of LibreOffice in order to work on the code. Some things will be left out by default like the binfilter code, unless you specifically ask for it. You didn't say what operating system you are using, or which web pages you are looking at. For all we know, you might be following some outdated instructions... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] convert detdata.cxx in SC module to std::vector
Hi Noel, On Wednesday, 2012-02-08 13:05:42 +0200, Noel Grandin wrote: Attached path converts usage of SV_DECL_PTRARR_DEL in sc/inc/detdata.hxx and associated code to std::vector. SV_DECL_PTRARR_DEL is one of those containers that take ownership of the objects pointed to, as you noticed and introduced deleting elements and DeleteAndDestroy() method, and as such it is a candidate for boost::ptr_vector instead of std::vector which makes workarounds like DeleteAndDestroy() unnecessary, erase()'ing an element will also delete the object. Care has to be taken when adding elements, ptr_vector if an element could not be added deletes the object, so a dangling pointer might be left and could be accessed, and a further delete would be attempted twice. I'd appreciate if you could rework the patch to use boost::ptr_vector instead. Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpdlXurcNafg.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
On Wed, 2012-02-08 at 15:11 +0200, Noel Grandin wrote: On 2012-02-08 14:54, Rene Engelhard wrote: Seriously, if someone can't install doxygen when configure errors out because doxygen is not there... The list of things to do for building LO is pretty steep for a first timer. Individually it may not seem like much, but when you've gone back to searching wiki pages and google for the 20th time, it gets frustrating Right ! and that sucks. So - I wonder, could we make the error message more helpful in this failure case: You don't have doxygen, please either install it or pass; --without-doxygen [or similar]. Disabling it will not impact your build, unless it is a product build If we are too difficult for newbies to build, this is a big problem, and not one to take lightly. Of course, we don't want to accidentally break distro packages by adapting to an incomplete system either. Potentially we could auto-fit to the system more aggressively to help newbies, but fail aggressively on missing packages if some --enable-product (or whatever) option is passed. Perhaps that might capture the best of both worlds (?). ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[RESOLVED][PATCH] proposed fix for fdo#43479
Just marking this thread as resolved, i.e. https://bugs.freedesktop.org/show_bug.cgi?id=43479 final fix pushed to 3-5 and 3-4 C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] convert detdata.cxx in SC module to std::vector
will do. On 2012-02-08 16:44, Eike Rathke wrote: Hi Noel, On Wednesday, 2012-02-08 13:05:42 +0200, Noel Grandin wrote: Attached path converts usage of SV_DECL_PTRARR_DEL in sc/inc/detdata.hxx and associated code to std::vector. SV_DECL_PTRARR_DEL is one of those containers that take ownership of the objects pointed to, as you noticed and introduced deleting elements and DeleteAndDestroy() method, and as such it is a candidate for boost::ptr_vector instead of std::vector which makes workarounds like DeleteAndDestroy() unnecessary, erase()'ing an element will also delete the object. Care has to be taken when adding elements, ptr_vector if an element could not be added deletes the object, so a dangling pointer might be left and could be accessed, and a further delete would be attempted twice. I'd appreciate if you could rework the patch to use boost::ptr_vector instead. Thanks Eike Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Android design?
On Wed, 2012-02-08 at 13:43 +0100, Stefan Knorr (Astron) wrote: Hehe. Take a look at the amazing mock-up and ideas that Mirek has been working on for a while now: http://clickortap.wordpress.com/frivl/ They look nice :-) (No, none of this is perfectly specced out yet, but there's some pretty cool stuff there.) So - one thing that I (personally) rather dislike is this bold / italic / underline meme that still lurks heavily in new UI designs. IMHO these need to be firmly held underwater until they expire ;-) Good mockups around making styles more visible and manageable, creating (and customizing) new styles [ which can indeed include the bold/italic/underline elements ;-] much appreciated for that. Otherwise, some good ideas there. Do we have excitable people wanting to do UI work in Java - that we can plug together with the core in due course ? it'd be great to parallelise that work. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
Hi, On Wed, Feb 08, 2012 at 02:47:21PM +, Michael Meeks wrote: On Wed, 2012-02-08 at 15:11 +0200, Noel Grandin wrote: On 2012-02-08 14:54, Rene Engelhard wrote: Seriously, if someone can't install doxygen when configure errors out because doxygen is not there... The list of things to do for building LO is pretty steep for a first timer. Individually it may not seem like much, but when you've gone back to searching wiki pages and google for the 20th time, it gets frustrating Right ! and that sucks. So - I wonder, could we make the error message more helpful in this failure case: You don't have doxygen, please either install it or pass; --without-doxygen [or similar]. Disabling it will not impact your build, unless it is a product build This is already there. Not word for word but in the sense. AC_ARG_WITH( [doxygen], AS_HELP_STRING( [--with-doxygen], [Specifies the doxygen executable to use when generating ODK C/C++ documentation. --without-doxygen disables generation of ODK C/C++ documentation. Not relevant in the --disable-odk case.]) [ Usage: --with-doxygen=absolute path to doxygen executable ],, [with_doxygen=yes]) OK, I know people don't even look at ./configure --help, but later: if test $enable_odk = no; then unset DOXYGEN else if test $with_doxygen = no; then AC_MSG_CHECKING([for doxygen]) unset DOXYGEN AC_MSG_RESULT([no]) else if test $with_doxygen = yes; then AC_PATH_PROG([DOXYGEN], [doxygen]) if test -z $DOXYGEN; then AC_MSG_RESULT([no]) AC_MSG_ERROR([doxygen not found in \$PATH; specify its pathname via --with-doxygen=..., or disable its use via --without-doxygen]) fi else AC_MSG_CHECKING([for doxygen]) DOXYGEN=$with_doxygen AC_MSG_RESULT([$DOXYGEN]) fi fi fi AC_SUBST([DOXYGEN]) it also mentions --without-doxygen. And again, I don't think it's hard to map doxygen not found to $whathever_command_to_install_doxygen. In any case I'll stop here, it just began with a wrong assumption of people what apt-get build-dep does (and I do believe that yum build-dep has the same issue) and that it might be really hard to just install doxygen (I understand that you maybe don't want to look up configure flags, but...) Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [PUSHED-partially][PATCH]a better about dialog
On Wed, 2012-02-08 at 12:48 +0100, Petr Mladek wrote: Also I am not sure whether the following change is desired: --- cut --- - Text[ en-US ] = This product was supplied by %OOOVENDOR.; + Text[ en-US ] = %PRODUCTNAME is a free and open source office suite developed by %OOOVENDOR. ; --- cut --- Note that the %OOOVENDOR might be also Red Hat, Ximian, SUSE for the distro specific builds. They provide the build (maybe with some modifications) but they do not develop the whole suite. Right - I wouldn't want us accidentally having developed by SUSE in there, and imagine no-one else would. Any chance of pulling that back a bit ? But - otherwise, this looks like rather a nice win - thanks Baris ! have you tried what it looks like in German [ with 2x as wide strings ;-]. Regards, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
R: Errror building LO lang=it - windows / cygwin
Now I get the same error but with a different behavior. After 3 hours cl.exe,sh.exe, perl.exe ' freeze', 0,00 % cpu -- cl had only 17KB of memory working set !! you can see the logs and other information at http://pastebin.com/u/walterLO. Regards walter ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Android design?
Hi, At 15:55 8-2-2012, Michael Meeks wrote: On Wed, 2012-02-08 at 13:43 +0100, Stefan Knorr (Astron) wrote: Hehe. Take a look at the amazing mock-up and ideas that Mirek has been working on for a while now: http://clickortap.wordpress.com/frivl/ They look nice :-) (No, none of this is perfectly specced out yet, but there's some pretty cool stuff there.) So - one thing that I (personally) rather dislike is this bold / italic / underline meme that still lurks heavily in new UI designs. IMHO these need to be firmly held underwater until they expire ;-) Thanks a lot for highlighting this Michael. I also wish this wicked witch were dead. Good mockups around making styles more visible and manageable, creating (and customizing) new styles [ which can indeed include the bold/italic/underline elements ;-] much appreciated for that. Last month there was a short thread on the LibreOffice-design list about how the UI of LibreOffice could be modified to encourage the correct use of styles (as opposed to ad-hoc styling). (The thread started at http://listarchives.libreoffice.org/global/design/msg03586.html.) We should continue thinking about this. Otherwise, some good ideas there. Do we have excitable people wanting to do UI work in Java - that we can plug together with the core in due course ? it'd be great to parallelise that work. Best regards, Christophe -- Christophe Strobbe K.U.Leuven - Dept. of Electrical Engineering - SCD Research Group on Document Architectures Kasteelpark Arenberg 10 bus 2442 B-3001 Leuven-Heverlee BELGIUM tel: +32 16 32 85 51 http://www.docarch.be/ Twitter: @RabelaisA11y --- Open source for accessibility: results from the AEGIS project www.aegis-project.eu --- Please don't invite me to Facebook, Quechup or other social networks. You may have agreed to their privacy policy, but I haven't. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [RFC] x11 / cairo-less build try #2
Hi Riccardo, On Tue, 2012-02-07 at 18:19 +0100, Riccardo Magliocchetti wrote: I've progressed a bit with X11 / cairo less build. Now everything builds but somethings chokes in make dev-install: As Matus says, you'll need to add some conditionals to the scp2 stuff - both in the makefile.mk's (or you can update SCPDEFS as generated by configure.in), and to add #ifndef HEADLESS's around the place there :-) When you've done that a rm -Rf unxlngi6.pro ; build deliver in scp2 - before re-running make install is prolly what you want to do. Attached all the changes that i have locally, they are diffed against an old master and i'd like to have a working build before rebasing. Makes good sense :-) If someone is so keen to take a look at the patches and point out what could be improved, uneeded changes (RepositoryModule_ooo.mk?) it'll be great. Of course, I'd push to something that works, and then clean it up later; but some thoughts: The Library_vcl.mk is becoming a bit of a rats-nest of cut/paste, I wonder if we can chunk up the common files into another variable that we can re-use in these different per-platform sections; I appreciate everyone else just munged it but ... ;-) I'm surprised we need to disable lingucomponent, linguistic, lotuswordpro, oovbaapi, vbahelper and wizards to build headless: of course, quite probably we don't want at least some of those - but did they really cause build issues ? Otherwise, it looks rather sane really :-) A couple of tests has been disabled because of no suitable windowing system found, exiting.\n error from vcl/unx/generic/plugadapt/salplug.cxx::CreateSalInstance(). And i suppose the same error will bite me when i'll try yo run what i have compiled. Oh - that is odd. Do you really want to create the plugadapt instance ? or have your own headless instance (mirroring a cut down version of the Android one perhaps ?). Of course, it is necessary to have the vcl/headless/ stuff connected up somewhere, we'll still need SalFrames in order to post events, and some sort of event loop to run the app, but it shouldn't be hard to get a really simple bitmap-rendering version in there. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
Hi Michael, from what I read here makes me feel like there are couple of switches, which are enabled by default, but can be disabled pretty safely. Some of them --disable-epm, --without-junit and --without-java were documented in the wiki: http://wiki.documentfoundation.org/Development/How_to_build Now --without-doxygen and --disable-odk look like they can be used, too. Probably --disable-mozilla as well? I guess it might be a good idea, to have a switch --minimal, which disables all switches, which are not needed unless in special situations. A side effect could be that less dependencies are needed and building LibreOffice takes less time. This should be fine for new users, who want to take first steps in building LibreOffice. Best regards, Alexander ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
Hi, On Wed, Feb 08, 2012 at 04:44:00PM +0100, Alexander Bergmann wrote: which are enabled by default, but can be disabled pretty safely. Some of them --disable-epm, --without-junit and --without-java were documented in the wiki: [1]http://wiki.documentfoundation.org/Development/How_to_build I agree with the first both. I think we should keep Java on per default, though to get a full build ((wizards, Base, filters, help index missing otherwise etc.) Now --without-doxygen and --disable-odk look like they can be used, too. You don't need --without-doxygen when you do --disable-odk, but yeah, I think --disable-odk per default could work (not everyone needs the SDK) Probably --disable-mozilla as well? ACK. Regards, Rene ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: PATCH build errors on Ubuntu 10.04
On 08/02/12 16:58, Rene Engelhard wrote: Hi, On Wed, Feb 08, 2012 at 04:44:00PM +0100, Alexander Bergmann wrote: which are enabled by default, but can be disabled pretty safely. Some of them --disable-epm, --without-junit and --without-java were documented in the wiki: [1]http://wiki.documentfoundation.org/Development/How_to_build I agree with the first both. I think we should keep Java on per default, though to get a full build ((wizards, Base, filters, help index missing otherwise etc.) i agree with Rene, Java and JUnit should be enabled by default, because also the complex/unoapi tests require that. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-4] Couple of wiki-help related patches
Hi,
I'm about to upload the new version of the 3.4 wikihelp. These are the
patches I am using to generate that, would be great to get them in the
repository :-) - can anybody sign-off push them for me? They are all
against the help repository.
Thank you,
Kendy
From 1a2123c6b92692f14734c4cb953fd9222f99a0bb Mon Sep 17 00:00:00 2001
From: Jan Holesovsky ke...@suse.cz
Date: Thu, 19 May 2011 22:04:00 +0200
Subject: [PATCH 1/5] hid.lst is not used any more.
---
helpcontent2/to-wiki/wikiconv2.py | 21 +
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py
index 6a3d766..7d5cc3e 100755
--- a/helpcontent2/to-wiki/wikiconv2.py
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -13,9 +13,6 @@ titles = []
# map of id - localized text
localization_data = {}
-# content of the hid.lst file for easier searching
-hid_lst = {}
-
# to collect a list of pages that will be redirections to the pages with nice
# names
redirects = []
@@ -118,16 +115,6 @@ replace_text_list = \
[$PRODUCTNAME, {{ProductName}}]
]
-def load_hid_lst():
-global hid_lst
-hid_lst = {}
-file = codecs.open(helpers/hid.lst, r, utf-8)
-for line in file:
-ids = line.strip().split( )
-if len(ids) == 2:
-hid_lst[ids[0].upper()] = ids[1]
-file.close()
-
def get_link_filename(link, name):
text = link.strip()
fragment = ''
@@ -397,12 +384,7 @@ class Bookmark(ElementBase):
self.app = parser.current_app_raw
self.target = parser.wiki_page_name
self.authoritative = parser.follow_embed
-if name.find('.uno:') == 0 or name.find('.HelpId:') == 0:
-self.redirect = name
-elif name.upper() in hid_lst:
-self.redirect = hid_lst[name.upper()]
-#else:
-#sys.stderr.write('Unhandled redirect %s\n'% name)
+self.redirect = name
def get_all(self):
global redirects
@@ -1281,7 +1263,6 @@ def convert(generate_redirects, lang, sdf_file):
global images
images = set()
-load_hid_lst()
loadallfiles(alltitles.csv)
if lang != '':
--
1.7.3.1
From b5f8b25f45e057d46089fcb3de8a4378dae806ce Mon Sep 17 00:00:00 2001
From: Jan Holesovsky ke...@suse.cz
Date: Thu, 1 Sep 2011 00:08:45 +0200
Subject: [PATCH 2/5] Adapt to the translations repository.
---
helpcontent2/help-to-wiki.py |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/helpcontent2/help-to-wiki.py b/helpcontent2/help-to-wiki.py
index ca3b774..d25cb99 100755
--- a/helpcontent2/help-to-wiki.py
+++ b/helpcontent2/help-to-wiki.py
@@ -94,11 +94,11 @@ os.system( python to-wiki/getalltitles.py source/text alltitles.csv )
try:
sdf_path = args[0]
except:
-sdf_path = '../../l10n/l10n/source'
+sdf_path = '../../translations/unxlngx6.pro/misc/sdf-l10n'
sys.stderr.write('Path to the .sdf files not provided, using %s\n'% sdf_path)
# do the work
for lang in langs:
-wikiconv2.convert(generate_redirects, lang, '%s/%s/localize.sdf'% (sdf_path, lang))
+wikiconv2.convert(generate_redirects, lang, '%s/%s.sdf'% (sdf_path, lang))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
--
1.7.3.1
From 2613378842796f999a35be4727739c78db8908ad Mon Sep 17 00:00:00 2001
From: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Fri, 2 Dec 2011 22:27:03 +0700
Subject: [PATCH 3/5] fdo#42924 don't ignore empty TableCell Element, also check if it's a header
Checking whether an empty TableCell Element is a header row is now in 2 cases:
* | e | h | h | h | h | ... = The empty cell should be a header
This case occurs when this row is the first row in the table.
* | h | p | p | e | p | ... = The empty cell should not be a header
This case occurs when this row is not the first row in the table,
but the first column is the row header.
where | is a column seperator, e is an empty cell, h is a header cell
(which has role=tablehead attribute), and p is not a header cell.
Note that parsing occurs left-to-right, so isTableHeader depends on
the last TableCell Element in that row. I assume that if the last element
is a header, that row should be a header row.
Currently this code gives correct behaviour, but checking whether a row
is the first row might be more correct.
---
helpcontent2/to-wiki/wikiconv2.py | 18 ++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py
index 7d5cc3e..0ad5038 100755
--- a/helpcontent2/to-wiki/wikiconv2.py
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -472,8 +472,10 @@ class Text:
class TableCell(ElementBase):
def __init__(self, attrs, parent):
ElementBase.__init__(self, 'tablecell', parent)
+self.cellHasChildElement = False
def start_element(self, parser, name, attrs):
+self.cellHasChildElement
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Bug 37361 depends on bug 40768, which changed state. Bug 40768 Summary: LibreOffice Writer doesn't get the right border style of an image or object in .doc files. https://bugs.freedesktop.org/show_bug.cgi?id=40768 What|Old Value |New Value Status|NEEDINFO|ASSIGNED Resolution||FIXED Status|ASSIGNED|RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 1/8] unicode: delete unused unicode:isBase() method
--- i18nutil/inc/i18nutil/unicode.hxx |1 - i18nutil/source/utility/unicode.cxx |1 - unusedcode.easy |1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx index 24e9c63..23ed754 100644 --- a/i18nutil/inc/i18nutil/unicode.hxx +++ b/i18nutil/inc/i18nutil/unicode.hxx @@ -55,7 +55,6 @@ public: static sal_Bool SAL_CALL isDigit( const sal_Unicode ch); static sal_Bool SAL_CALL isControl( const sal_Unicode ch); static sal_Bool SAL_CALL isPrint( const sal_Unicode ch); -static sal_Bool SAL_CALL isBase( const sal_Unicode ch); static sal_Bool SAL_CALL isAlpha( const sal_Unicode ch); static sal_Bool SAL_CALL isSpace( const sal_Unicode ch); static sal_Bool SAL_CALL isWhiteSpace( const sal_Unicode ch); diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 00d4e80..873ecd8 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -418,7 +418,6 @@ IsType(unicode::isAlpha, ALPHAMASK) IsType(unicode::isDigit, DIGITMASK) IsType(unicode::isAlphaDigit, ALPHAMASK|DIGITMASK) IsType(unicode::isSpace, SPACEMASK) -IsType(unicode::isBase, BASEMASK) IsType(unicode::isPunctuation, PUNCTUATIONMASK) #define CONTROLSPACEbit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\ diff --git a/unusedcode.easy b/unusedcode.easy index 33aca1d..c2c6946 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1528,7 +1528,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const, com::sun::star::uno:: ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const, std::__debug::vectorucbhelper::ContentProviderData, std::allocatorucbhelper::ContentProviderData const) ucbhelper::SimpleCertificateValidationRequest::getResponse() const unicode::getCharType(unsigned short) -unicode::isBase(unsigned short) unicode::isPunctuation(unsigned short) unicode::isTitle(unsigned short) unographic::GraphicDescriptor::isValid() const -- 1.7.9 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 2/8] unicode: delete unused unicode:isPunctuation() method
--- i18nutil/inc/i18nutil/unicode.hxx |1 - i18nutil/source/utility/unicode.cxx |1 - unusedcode.easy |1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx index 23ed754..75b5730 100644 --- a/i18nutil/inc/i18nutil/unicode.hxx +++ b/i18nutil/inc/i18nutil/unicode.hxx @@ -59,7 +59,6 @@ public: static sal_Bool SAL_CALL isSpace( const sal_Unicode ch); static sal_Bool SAL_CALL isWhiteSpace( const sal_Unicode ch); static sal_Bool SAL_CALL isAlphaDigit( const sal_Unicode ch); -static sal_Bool SAL_CALL isPunctuation( const sal_Unicode ch); //Map an ISO 15924 script code to Latin/Asian/Complex/Weak static sal_Int16 SAL_CALL getScriptClassFromUScriptCode(UScriptCode eScript); diff --git a/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx index 873ecd8..9ebc9d8 100644 --- a/i18nutil/source/utility/unicode.cxx +++ b/i18nutil/source/utility/unicode.cxx @@ -418,7 +418,6 @@ IsType(unicode::isAlpha, ALPHAMASK) IsType(unicode::isDigit, DIGITMASK) IsType(unicode::isAlphaDigit, ALPHAMASK|DIGITMASK) IsType(unicode::isSpace, SPACEMASK) -IsType(unicode::isPunctuation, PUNCTUATIONMASK) #define CONTROLSPACEbit(0x09)|bit(0x0a)|bit(0x0b)|bit(0x0c)|bit(0x0d)|\ bit(0x1c)|bit(0x1d)|bit(0x1e)|bit(0x1f) diff --git a/unusedcode.easy b/unusedcode.easy index c2c6946..3939d9f 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1528,7 +1528,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString const, com::sun::star::uno:: ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory const, std::__debug::vectorucbhelper::ContentProviderData, std::allocatorucbhelper::ContentProviderData const) ucbhelper::SimpleCertificateValidationRequest::getResponse() const unicode::getCharType(unsigned short) -unicode::isPunctuation(unsigned short) unicode::isTitle(unsigned short) unographic::GraphicDescriptor::isValid() const utl::NodeValueAccessor::bind(com::sun::star::uno::Any*) -- 1.7.9 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 3/8] unicode: delete unused unicode:isTitle() method
---
i18nutil/inc/i18nutil/unicode.hxx |1 -
i18nutil/source/utility/unicode.cxx |1 -
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/i18nutil/inc/i18nutil/unicode.hxx
b/i18nutil/inc/i18nutil/unicode.hxx
index 75b5730..7fce041 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -51,7 +51,6 @@ public:
static sal_Int32 SAL_CALL getCharType( const sal_Unicode ch );
static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
-static sal_Bool SAL_CALL isTitle( const sal_Unicode ch);
static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
static sal_Bool SAL_CALL isControl( const sal_Unicode ch);
static sal_Bool SAL_CALL isPrint( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx
b/i18nutil/source/utility/unicode.cxx
index 9ebc9d8..056e78a 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -411,7 +411,6 @@ sal_Bool SAL_CALL func( const sal_Unicode ch) {\
IsType(unicode::isUpper, UPPERMASK)
IsType(unicode::isLower, LOWERMASK)
-IsType(unicode::isTitle, DIGITMASK)
IsType(unicode::isControl, CONTROLMASK)
IsType(unicode::isPrint, PRINTMASK)
IsType(unicode::isAlpha, ALPHAMASK)
diff --git a/unusedcode.easy b/unusedcode.easy
index 3939d9f..ae4ffad 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1528,7 +1528,6 @@ ucbhelper::Content::insertNewContent(rtl::OUString
const, com::sun::star::uno::
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::ContentProviderData const)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
unicode::getCharType(unsigned short)
-unicode::isTitle(unsigned short)
unographic::GraphicDescriptor::isValid() const
utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 4/8] unicode: delete unused unicode:getCharType() method
---
i18nutil/inc/i18nutil/unicode.hxx |1 -
i18nutil/source/utility/unicode.cxx | 64 ---
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 66 deletions(-)
diff --git a/i18nutil/inc/i18nutil/unicode.hxx
b/i18nutil/inc/i18nutil/unicode.hxx
index 7fce041..f9ff6e1 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.hxx
@@ -48,7 +48,6 @@ public:
static sal_Unicode SAL_CALL
getUnicodeScriptStart(com::sun::star::i18n::UnicodeScript type);
static sal_Unicode SAL_CALL
getUnicodeScriptEnd(com::sun::star::i18n::UnicodeScript type);
static sal_uInt8 SAL_CALL getUnicodeDirection( const sal_Unicode ch );
-static sal_Int32 SAL_CALL getCharType( const sal_Unicode ch );
static sal_Bool SAL_CALL isUpper( const sal_Unicode ch);
static sal_Bool SAL_CALL isLower( const sal_Unicode ch);
static sal_Bool SAL_CALL isDigit( const sal_Unicode ch);
diff --git a/i18nutil/source/utility/unicode.cxx
b/i18nutil/source/utility/unicode.cxx
index 056e78a..dcc5b36 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -425,70 +425,6 @@ sal_Bool SAL_CALL unicode::isWhiteSpace( const sal_Unicode
ch) {
return (ch != 0xa0 isSpace(ch)) || (ch = 0x1F (bit(ch)
(CONTROLSPACE)));
}
-sal_Int32 SAL_CALL unicode::getCharType( const sal_Unicode ch )
-{
-using namespace ::com::sun::star::i18n::KCharacterType;
-
-switch ( getUnicodeType( ch ) ) {
-// Upper
-case UnicodeType::UPPERCASE_LETTER :
-return UPPER|LETTER|PRINTABLE|BASE_FORM;
-
-// Lower
-case UnicodeType::LOWERCASE_LETTER :
-return LOWER|LETTER|PRINTABLE|BASE_FORM;
-
-// Title
-case UnicodeType::TITLECASE_LETTER :
-return TITLE_CASE|LETTER|PRINTABLE|BASE_FORM;
-
-// Letter
-case UnicodeType::MODIFIER_LETTER :
-case UnicodeType::OTHER_LETTER :
-return LETTER|PRINTABLE|BASE_FORM;
-
-// Digit
-case UnicodeType::DECIMAL_DIGIT_NUMBER:
-case UnicodeType::LETTER_NUMBER:
-case UnicodeType::OTHER_NUMBER:
-return DIGIT|PRINTABLE|BASE_FORM;
-
-// Base
-case UnicodeType::NON_SPACING_MARK:
-case UnicodeType::ENCLOSING_MARK:
-case UnicodeType::COMBINING_SPACING_MARK:
-return BASE_FORM|PRINTABLE;
-
-// Print
-case UnicodeType::SPACE_SEPARATOR:
-
-case UnicodeType::DASH_PUNCTUATION:
-case UnicodeType::INITIAL_PUNCTUATION:
-case UnicodeType::FINAL_PUNCTUATION:
-case UnicodeType::CONNECTOR_PUNCTUATION:
-case UnicodeType::OTHER_PUNCTUATION:
-
-case UnicodeType::MATH_SYMBOL:
-case UnicodeType::CURRENCY_SYMBOL:
-case UnicodeType::MODIFIER_SYMBOL:
-case UnicodeType::OTHER_SYMBOL:
-return PRINTABLE;
-
-// Control
-case UnicodeType::CONTROL:
-case UnicodeType::FORMAT:
-return CONTROL;
-
-case UnicodeType::LINE_SEPARATOR:
-case UnicodeType::PARAGRAPH_SEPARATOR:
-return CONTROL|PRINTABLE;
-
-// for all others
-default:
-return 0;
-}
-}
-
sal_Int16 SAL_CALL unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
{
//See unicode/uscript.h
diff --git a/unusedcode.easy b/unusedcode.easy
index ae4ffad..743ba38 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1527,7 +1527,6 @@
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequenceint const)
ucbhelper::Content::insertNewContent(rtl::OUString const,
com::sun::star::uno::Sequenceint const,
com::sun::star::uno::Sequencecom::sun::star::uno::Any const,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
ucbhelper::Content)
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::ContentProviderData const)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
-unicode::getCharType(unsigned short)
unographic::GraphicDescriptor::isValid() const
utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 5/8] unographic: delete unused GraphicDescriptor::isValid() method
---
svtools/source/graphic/descriptor.cxx |7 ---
svtools/source/graphic/descriptor.hxx |2 --
unusedcode.easy |1 -
3 files changed, 0 insertions(+), 10 deletions(-)
diff --git a/svtools/source/graphic/descriptor.cxx
b/svtools/source/graphic/descriptor.cxx
index a2441c9..378162d 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -116,13 +116,6 @@ void GraphicDescriptor::init( const uno::Reference
io::XInputStream rxIStm,
//
--
-bool GraphicDescriptor::isValid() const
-{
-return( mpGraphic ? ( mpGraphic-GetType() != GRAPHIC_NONE ) : ( meType !=
GRAPHIC_NONE ) );
-}
-
-//
--
-
void GraphicDescriptor::implCreate( SvStream rIStm, const ::rtl::OUString*
pURL )
{
String aURL;
diff --git a/svtools/source/graphic/descriptor.hxx
b/svtools/source/graphic/descriptor.hxx
index 2eeff29..a2b7e26 100644
--- a/svtools/source/graphic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.hxx
@@ -89,8 +89,6 @@ public:
void init( const ::rtl::OUString rURL ) throw();
void init( const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxIStm, const ::rtl::OUString rURL )
throw();
-bool isValid() const;
-
static ::rtl::OUString getImplementationName_Static() throw();
static ::com::sun::star::uno::Sequence ::rtl::OUString
getSupportedServiceNames_Static() throw();
diff --git a/unusedcode.easy b/unusedcode.easy
index 743ba38..a7b1aa3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1527,7 +1527,6 @@
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequenceint const)
ucbhelper::Content::insertNewContent(rtl::OUString const,
com::sun::star::uno::Sequenceint const,
com::sun::star::uno::Sequencecom::sun::star::uno::Any const,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
ucbhelper::Content)
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::ContentProviderData const)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
-unographic::GraphicDescriptor::isValid() const
utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
utl::OConfigurationValueContainer::getServiceFactory() const
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 6/8] utl: delete unused NodeValueAccessor::bind() method
---
unotools/source/config/configvaluecontainer.cxx | 10 --
unusedcode.easy |1 -
2 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/unotools/source/config/configvaluecontainer.cxx
b/unotools/source/config/configvaluecontainer.cxx
index 8a0fdcd..8e5d2bd 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -68,7 +68,6 @@ namespace utl
NodeValueAccessor( const ::rtl::OUString _rNodePath );
void bind( void* _pLocation, const Type _rType );
-void bind( Any* _pLocation );
boolisBound( ) const{ return ( ltUnbound
!= eLocationType ) ( NULL != pLocation ); }
const ::rtl::OUString getPath( ) const{ return
sRelativePath; }
@@ -103,15 +102,6 @@ namespace utl
aDataType = _rType;
}
-void NodeValueAccessor::bind( Any* _pLocation )
-{
-DBG_ASSERT( !isBound(), NodeValueAccessor::bind: already bound! );
-
-eLocationType = ltAnyInstance;
-pLocation = _pLocation;
-aDataType = ::getCppuType( _pLocation );
-}
-
#ifndef UNX
static
#endif
diff --git a/unusedcode.easy b/unusedcode.easy
index a7b1aa3..53c1aea 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1527,7 +1527,6 @@
ucbhelper::Content::getPropertyValues(com::sun::star::uno::Sequenceint const)
ucbhelper::Content::insertNewContent(rtl::OUString const,
com::sun::star::uno::Sequenceint const,
com::sun::star::uno::Sequencecom::sun::star::uno::Any const,
com::sun::star::uno::Referencecom::sun::star::io::XInputStream const,
ucbhelper::Content)
ucbhelper::ContentBroker::ContentBroker(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const, std::__debug::vectorucbhelper::ContentProviderData,
std::allocatorucbhelper::ContentProviderData const)
ucbhelper::SimpleCertificateValidationRequest::getResponse() const
-utl::NodeValueAccessor::bind(com::sun::star::uno::Any*)
utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNode const) const
utl::OConfigurationValueContainer::getServiceFactory() const
utl::TransliterationWrapper::compareSubstring(String const, int, int, String
const, int, int) const
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 7/8] vcl: I18nHelper: delete unused getLocal() method
---
unusedcode.easy |1 -
vcl/inc/vcl/i18nhelp.hxx|2 --
vcl/source/app/i18nhelp.cxx |5 -
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/unusedcode.easy b/unusedcode.easy
index 53c1aea..f4115ce 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1531,7 +1531,6 @@ utl::OConfigurationNode::appendNode(rtl::OUString const,
utl::OConfigurationNod
utl::OConfigurationValueContainer::getServiceFactory() const
utl::TransliterationWrapper::compareSubstring(String const, int, int, String
const, int, int) const
vcl::I18nHelper::GetDate(Date const) const
-vcl::I18nHelper::getLocale() const
vcl::LabeledElement::setLabel(boost::shared_ptrvcl::WindowArranger const)
vcl::LazyDeletorMenu::is_less(Menu*, Menu*)
vcl::MatrixArranger::addChild(boost::shared_ptrvcl::WindowArranger const,
unsigned int, unsigned int, int)
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index a83afa4..faafdfe 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -79,8 +79,6 @@ public:
I18nHelper( ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory rxMSF, const
::com::sun::star::lang::Locale rLocale );
~I18nHelper();
-const ::com::sun::star::lang::Locale getLocale() const;
-
sal_Int32 CompareString( const String rStr1, const String rStr2 )
const;
sal_BoolMatchString( const String rStr1, const String rStr2 ) const;
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index f8967b2..f1505cc 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -87,11 +87,6 @@ LocaleDataWrapper
vcl::I18nHelper::ImplGetLocaleDataWrapper() const
return *mpLocaleDataWrapper;
}
-const ::com::sun::star::lang::Locale vcl::I18nHelper::getLocale() const
-{
-return maLocale;
-}
-
inline bool is_formatting_mark( sal_Unicode c )
{
if( (c = 0x200B) (c = 0x200F) )// BiDi and zero-width-markers
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 8/8] vcl: I18nHelper: delete unused GetDate() method
---
vcl/inc/vcl/i18nhelp.hxx|1 -
vcl/source/app/i18nhelp.cxx |7 ---
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index faafdfe..610f5cf 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.hxx
@@ -84,7 +84,6 @@ public:
sal_BoolMatchString( const String rStr1, const String rStr2 ) const;
sal_BoolMatchMnemonic( const String rString, sal_Unicode
cMnemonicChar ) const;
-String GetDate( const Date rDate ) const;
String GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool
bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const;
static String filterFormattingChars( const String );
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index f1505cc..ea4eb34 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -170,13 +170,6 @@ sal_Bool vcl::I18nHelper::MatchMnemonic( const String
rString, sal_Unicode cMne
}
-String vcl::I18nHelper::GetDate( const Date rDate ) const
-{
-::osl::Guard ::osl::Mutex aGuard( ((vcl::I18nHelper*)this)-maMutex );
-
-return ImplGetLocaleDataWrapper().getDate( rDate );
-}
-
String vcl::I18nHelper::GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool
bUseThousandSep, sal_Bool bTrailingZeros ) const
{
return ImplGetLocaleDataWrapper().getNum( nNumber, nDecimals,
bUseThousandSep, bTrailingZeros );
--
1.7.9
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH 0/8] Remove some more unused methods
Here are 8 patches removing some more unused methods in the tree. Hopefully I didn't mess up and delete somethings that were being used by Windows or other architectures, I think my searching was sufficient, but I might have missed something. All of these patches are contributed under the LGPLv3+ / MPL. thanks, greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 4/4] Re: [PATCH 0/4] Remove some unused methods
On Tue, Feb 07, 2012 at 01:26:18AM +0100, Michael Stahl wrote: patches to remove the tools/fsys trainwreck completely and adapt callers to use osl/file.hxx would be appreciated of course :) I've started to look into this. It is safe to say that I should only be cleaning up the usages outside of the tools/ directory? And that any in-tools directory usage is safe in that once all out of the local module users are gone, we can just delete the whole module? thanks, greg k-h ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
OK to merge the fw? libraries in framework?
While trying to find easy ways to lower the number of (shared) libraries, which is more or less on the critical path for the Android work (the stupid run-time linker on Android has a low (from our perverse perspective) limit on the number of shared libraries that can be used at a time in a process), I started looking at the libraries built in the framework module (mnemonically and self-documentingly named fwe, fwi, fwk, fwl and fwm). Is there any fundamental problem in just shoving all the objects in framework into one library (for instance the fwk one, or one renamed to the perhaps more logical name framework)? My guess is that the framework code might originally have gone into just one shared library, anybody know the reason why it was split up into five separate ones? (Obviously the corresponding component files will have to be merged, too, and references to the libraries changed to reference fwk (only) instead in various places.) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Android design?
On 08/02/2012 15:55, Michael Meeks wrote: On Wed, 2012-02-08 at 13:43 +0100, Stefan Knorr (Astron) wrote: Hehe. Take a look at the amazing mock-up and ideas that Mirek has been working on for a while now: http://clickortap.wordpress.com/frivl/ They look nice :-) (No, none of this is perfectly specced out yet, but there's some pretty cool stuff there.) So - one thing that I (personally) rather dislike is this bold / italic / underline meme that still lurks heavily in new UI designs. IMHO these need to be firmly held underwater until they expire ;-) Good mockups around making styles more visible and manageable, creating (and customizing) new styles [ which can indeed include the bold/italic/underline elements ;-] much appreciated for that. Otherwise, some good ideas there. Do we have excitable people wanting to do UI work in Java - that we can plug together with the core in due course ? it'd be great to parallelise that work. Hey Michael I would love to do some UI work in java, and odd as it sounds its something i rather enjoy doing. What does one need to get goign with being able to do the UI work? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [REVIEW:3-5] postgresql compatibility with 8.4
On 08/02/12 13:51, Lionel Elie Mamane wrote: Attached patch restores compatibility of PostgreSQL-SDBC with PostgreSQL server version 8.4. LibO 3.5.0 accidentally works only with 9.0 and later. (9.0 came after 8.4, there is no 8.5.) Basically, it replaces try to be extra-smart and look directly into the PostgreSQL internals by get information from the view PostgreSQL provides for this purpose. Because this view is buggy, it still goes look directly in the PostgreSQL internals to work around that bug (which has been fixed in their development branch, PostgreSQL 9.2), but not in a way that breaks compatibility with PostgreSQL 8.4. Please apply to libreoffice-3-5. given that you are the only one here who has any idea how this stuff is supposed to work anyway i've just rubber-stamped it :) pushed to libreoffice-3-5: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=9739e6163b2429c4f23d91183089d8a768a87faf ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
