[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
