[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/inc
solenv/inc/minor.mk |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 47fce99b80310f1d535f79c0f8a0e1363ed09389 Author: Petr Mladek Date: Thu Apr 5 11:24:07 2012 +0200 match version in about dialog and file properties (fdo#47840) bump VERSIONMICRO to 3 and reset buildid to 0 Signed-off-by: Andras Timar diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 0b94955..fdd3cd2 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,11 +1,11 @@ RSCVERSION=350 -RSCREVISION=350m1(Build:300) -BUILD=300 +RSCREVISION=350m1(Build:0) +BUILD=0 LAST_MINOR=m1 SOURCEVERSION=OOO350 VERSIONMAJOR=3 VERSIONMINOR=5 -VERSIONMICRO=0 +VERSIONMICRO=3 COPYRIGHTYEARRANGE=2000-2012 ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/inc/formularesult.hxx | 501 ++
sc/source/core/tool/formularesult.cxx | 452 ++
3 files changed, 486 insertions(+), 468 deletions(-)
New commits:
commit 967a3debe7fac2d749324be9af99192d94439da8
Author: Kohei Yoshida
Date: Tue Apr 10 01:20:03 2012 -0400
Non inline methods of ScFormulaResult.
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 224df82..39d9c33 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -178,6 +178,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/editutil \
sc/source/core/tool/filtopt \
sc/source/core/tool/formulaparserpool \
+ sc/source/core/tool/formularesult \
sc/source/core/tool/hints \
sc/source/core/tool/inputopt \
sc/source/core/tool/interpr1 \
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 8a35b43..2983176 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -30,6 +30,8 @@
#define SC_FORMULARESULT_HXX
#include "token.hxx"
+#include "scdllapi.h"
+
#include
/** Store a variable formula cell result, balancing between runtime performance
@@ -68,7 +70,7 @@ class ScFormulaResult
/** Reset mnError, mbEmpty and mbEmptyDisplayedAsString to their defaults
prior to assigning other types */
-inline voidResetToDefaults();
+void ResetToDefaults();
/** If token is of formula::svError set error code and decrement RefCount.
If token is of formula::svEmptyCell set mbEmpty and mbEmptyAsString and
@@ -81,65 +83,24 @@ class ScFormulaResult
DecRef'ed prior to this call, p will be assigned to mpToken if not
resolved.
ATTENTION! Token may get deleted in this call! */
-inline voidResolveToken( const formula::FormulaToken * p
);
+void ResolveToken( const formula::FormulaToken * p );
public:
-/** Effectively type svUnknown. */
-ScFormulaResult()
-: mpToken(NULL), mnError(0), mbToken(true),
-mbEmpty(false),
mbEmptyDisplayedAsString(false),
-meMultiline(MULTILINE_UNKNOWN) {}
-
-ScFormulaResult( const ScFormulaResult & r )
-: mnError( r.mnError), mbToken( r.mbToken),
-mbEmpty( r.mbEmpty),
-mbEmptyDisplayedAsString(
r.mbEmptyDisplayedAsString),
-meMultiline( r.meMultiline)
-{
-if (mbToken)
-{
-mpToken = r.mpToken;
-if (mpToken)
-{
-// Since matrix dimension and
-// results are assigned to a matrix
-// cell formula token we have to
-// clone that instead of sharing
it.
-const ScMatrixFormulaCellToken*
pMatFormula =
-r.GetMatrixFormulaCellToken();
-if (pMatFormula)
-{
-mpToken = new
ScMatrixFormulaCellToken( *pMatFormula);
-mpToken->IncRef();
-}
-else
-IncrementTokenRef( mpToken);
-}
-}
-else
-mfValue = r.mfValue;
-}
+/** Effectively type svUnknown. */
+ScFormulaResult();
+
+ScFormulaResult( const ScFormulaResult & r );
/** Same comments as for SetToken() apply! */
-explicitScFormulaResult( const formula::FormulaToken*
p )
-: mnError(0), mbToken(false),
-mbEmpty(false),
mbEmptyDisplayedAsString(false),
-meMultiline(MULTILINE_UNKNOWN)
-{
-SetToken( p);
-}
-
-~ScFormulaResult()
-{
-if (mbToken && mpToken)
-mpToken->DecR
[Libreoffice-commits] .: 3 commits - sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk|1
sc/inc/recursionhelper.hxx | 93 +---
sc/source/core/data/cell.cxx|6 -
sc/source/core/tool/recursionhelper.cxx | 121
4 files changed, 146 insertions(+), 75 deletions(-)
New commits:
commit 53a40d5e0dd06735a6e44cd16ed47538108035de
Author: Kohei Yoshida
Date: Mon Apr 9 21:45:19 2012 -0400
Make this non-inline too; for easier debugging.
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index f2a258d..929e24f 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -90,7 +90,7 @@ public:
bool & GetConvergingReference(){ return bConverging; }
void StartIteration();
void ResumeIteration();
-voidIncIteration() { ++nIteration; }
+void IncIteration();
void EndIteration();
ScFormulaRecursionList::iterator GetLastIterationStart() { return
aLastIterationStart; }
diff --git a/sc/source/core/tool/recursionhelper.cxx
b/sc/source/core/tool/recursionhelper.cxx
index b98484b..cbee508 100644
--- a/sc/source/core/tool/recursionhelper.cxx
+++ b/sc/source/core/tool/recursionhelper.cxx
@@ -84,6 +84,11 @@ void ScRecursionHelper::ResumeIteration()
aLastIterationStart = GetIterationStart();
}
+void ScRecursionHelper::IncIteration()
+{
+++nIteration;
+}
+
void ScRecursionHelper::EndIteration()
{
aRecursionFormulas.erase( GetIterationStart(), GetIterationEnd());
commit 4be657d53281680ebfa72e96b93705599f4178e1
Author: Kohei Yoshida
Date: Mon Apr 9 21:40:08 2012 -0400
Removed duplicated methods.
diff --git a/sc/inc/recursionhelper.hxx b/sc/inc/recursionhelper.hxx
index 176a93d..f2a258d 100644
--- a/sc/inc/recursionhelper.hxx
+++ b/sc/inc/recursionhelper.hxx
@@ -83,14 +83,6 @@ public:
void Insert( ScFormulaCell* p, bool bOldRunning, const ScFormulaResult &
rRes );
-ScFormulaRecursionList::iteratorGetStart()
-{
-return aRecursionFormulas.begin();
-}
-ScFormulaRecursionList::iteratorGetEnd()
-{
-return aRecursionFormulas.end();
-}
boolIsInIterationReturn() const { return bInIterationReturn; }
void SetInIterationReturn( bool b );
boolIsDoingIteration() const{ return nIteration > 0; }
@@ -102,8 +94,8 @@ public:
void EndIteration();
ScFormulaRecursionList::iterator GetLastIterationStart() { return
aLastIterationStart; }
-ScFormulaRecursionList::iterator GetIterationStart() { return GetStart(); }
-ScFormulaRecursionList::iterator GetIterationEnd() { return GetEnd(); }
+ScFormulaRecursionList::iterator GetIterationStart();
+ScFormulaRecursionList::iterator GetIterationEnd();
/** Any return, recursion or iteration, iteration is always coupled with
recursion. */
boolIsInReturn() const { return bInRecursionReturn; }
diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index f191c5d..9ccadde 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1390,9 +1390,9 @@ void ScFormulaCell::Interpret()
{
rRecursionHelper.SetInRecursionReturn( false);
for (ScFormulaRecursionList::const_iterator aIter(
-rRecursionHelper.GetStart());
+rRecursionHelper.GetIterationStart());
!rRecursionHelper.IsInReturn() && aIter !=
-rRecursionHelper.GetEnd(); ++aIter)
+rRecursionHelper.GetIterationEnd(); ++aIter)
{
ScFormulaCell* pCell = (*aIter).pCell;
if (pCell->IsDirtyOrInTableOpDirty())
@@ -1412,7 +1412,7 @@ void ScFormulaCell::Interpret()
else if (bResumeIteration ||
rRecursionHelper.IsDoingIteration())
rRecursionHelper.GetList().erase(
-rRecursionHelper.GetStart(),
+rRecursionHelper.GetIterationStart(),
rRecursionHelper.GetLastIterationStart());
else
rRecursionHelper.Clear();
diff --git a/sc/source/core/tool/recursionhelper.cxx
b/sc/source/core/tool/recursionhelper.cxx
index 98e6c28..b98484b 100644
--- a/sc/source/core/tool/recursionhelper.cxx
+++ b/sc/source/core/tool/recursionhelper.cxx
@@ -32,13 +32,13 @@ void ScRecursionHelper::Init()
{
nRecursionCount= 0;
bInRecursionReturn = bDoingRecursion = bInIterationReturn = false;
-aInsertPos = GetEnd();
+aInsertPos = GetIterationEnd();
ResetIteration();
}
void ScRecursionHelper::ResetIteration()
{
-aLastIterationStart = GetEnd();
+aLastIterationStart = GetIterationEnd();
nIteration = 0;
bConverging = false;
}
@@ -90,6 +90,16 @@ void ScRecur
[Libreoffice-commits] .: 2 commits - sfx2/source
sfx2/source/appl/impldde.cxx |3 -
sfx2/source/appl/sfxhelp.cxx |3 -
sfx2/source/appl/shutdowniconOs2.cxx | 94 ---
sfx2/source/bastyp/frmhtml.cxx |3 -
sfx2/source/bastyp/progress.cxx |8 --
sfx2/source/doc/docfile.cxx |3 -
sfx2/source/doc/doctempl.cxx |2
sfx2/source/doc/docvor.cxx |1
sfx2/source/doc/frmdescr.cxx |2
sfx2/source/doc/oleprops.cxx |1
10 files changed, 120 deletions(-)
New commits:
commit e194f5bda1c7cb218f649d316122513f571c5180
Author: Takeshi Abe
Date: Tue Apr 10 06:50:53 2012 +0900
removed unused defines
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index ee4c3db..9184f57 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -54,9 +54,6 @@
#include
#include
-#define DDELINK_COLD0
-#define DDELINK_HOT 1
-
#define DDELINK_ERROR_APP 1
#define DDELINK_ERROR_DATA 2
#define DDELINK_ERROR_LINK 3
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 80a8f88..1335e1f 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -86,9 +86,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::system;
-#define ERROR_TAG String( DEFINE_CONST_UNICODE("Error: ") )
-#define PATH_TAGString( DEFINE_CONST_UNICODE("\nPath: ") )
-
class NoHelpErrorBox : public ErrorBox
{
public:
diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx
index d8b9e18..dc24e35 100644
--- a/sfx2/source/bastyp/frmhtml.cxx
+++ b/sfx2/source/bastyp/frmhtml.cxx
@@ -40,9 +40,6 @@
#include
#include "sfxtypes.hxx"
-#define SFX_HTMLFRMSIZE_REL 0x0001
-#define SFX_HTMLFRMSIZE_PERCENT 0x0002
-
static sal_Char const sHTML_SC_yes[] = "YES";
static sal_Char const sHTML_SC_no[] = "NO";
static sal_Char const sHTML_SC_auto[] = "AUTO";
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 22025a6..f31b125 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -82,17 +82,9 @@ struct SfxProgress_Impl
//
-#define TIMEOUT_PROGRESS 5L /* 10th s */
-#define MAXPERCENT_PROGRESS 33
-
-#define TIMEOUT_RESCHEDULE 10L /* 10th s */
-#define MAXPERCENT_RESCHEDULE 50
-
#define Progress
#include "sfxslots.hxx"
-#define aTypeLibInfo aProgressTypeLibImpl
-
//
extern sal_uInt32 Get10ThSec();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2dc3572..0f30aab 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -137,9 +137,6 @@ using namespace ::com::sun::star::io;
#include "sfxacldetect.hxx"
#include "officecfg/Office/Common.hxx"
-#define MAX_REDIRECT 5
-
-
//==
namespace {
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index e2733a6..9d3230d 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -106,8 +106,6 @@ using ::std::advance;
//
-// #define DONT_USE_HIERARCHY
-
#define TITLE "Title"
#define IS_FOLDER "IsFolder"
#define PROPERTY_TYPE "TypeDescription"
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 00a0037..e9ee57d 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -73,7 +73,6 @@
#include
#include
-static const char cDelim = ':';
sal_Bool SfxOrganizeListBox_Impl::bDropMoveOk = sal_True;
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 760869f..e4f73a2 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -37,8 +37,6 @@
DBG_NAME(SfxFrameDescriptor);
-#define VERSION (sal_uInt16) 3
-
struct SfxFrameDescriptor_Impl
{
Wallpaper* pWallpaper;
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index cab4f0a..6a8cf46 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -40,7 +40,6 @@
//
-#define VERSION 11
#define STREAM_BUFFER_SIZE 2048
// usings
commit e5c6f53714335360c360e99b851da64bd2ccf74f
Author: Takeshi Abe
Date: Tue Apr 10 06:29:09 2012 +0900
removed OS/2 one
diff --git a/sfx2/source/appl/shutdowniconOs2.cxx
b/sfx2/source/appl/shutdowniconOs2.cxx
deleted file mode 100644
index 56932ff..000
--- a/sfx2/source/appl/shutdowniconOs2.cxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit c227447b9ab253a1d263b315ad0a7dbba4b08ff1
Author: Fridrich Å trba
Date: Mon Apr 9 23:49:31 2012 +0200
Write out the groupping
diff --git a/writerperfect/source/filter/OdgGenerator.cxx
b/writerperfect/source/filter/OdgGenerator.cxx
index 897ce4e..da6d64d 100644
--- a/writerperfect/source/filter/OdgGenerator.cxx
+++ b/writerperfect/source/filter/OdgGenerator.cxx
@@ -805,10 +805,12 @@ void OdgGenerator::setStyle(const ::WPXPropertyList
&propList, const ::WPXProper
void OdgGenerator::startLayer(const ::WPXPropertyList & /* propList */)
{
+mpImpl->mBodyElements.push_back(new TagOpenElement("draw:g"));
}
void OdgGenerator::endLayer()
{
+mpImpl->mBodyElements.push_back(new TagCloseElement("draw:g"));
}
void OdgGenerator::drawRectangle(const ::WPXPropertyList &propList)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_GCC_class.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 1a41f2730da3b9aa2c89d9420209a4b4d2ecb9aa Author: Matúš Kukan Date: Mon Apr 9 23:45:15 2012 +0200 this was accidentally removed diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 9b302d3..8014915 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -28,6 +28,7 @@ gb_AsmObject_get_source = $(1)/$(2).s define gb_AsmObject__command $(call gb_Output_announce,$(2),$(true),ASM,3) $(call gb_Helper_abbreviate_dirs,\ + mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ $(DEFS) \ $(T_CFLAGS) \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - Module_tail_build.mk sw/CppunitTest_sw_filters_test.mk
Module_tail_build.mk |2 +- sw/CppunitTest_sw_filters_test.mk |3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) New commits: commit 0f0063e31d211157e3252ca850236eb45dcf31d1 Author: Tor Lillqvist Date: Mon Apr 9 23:37:06 2012 +0300 xmlhelp not built for non-desktop OSes diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk index 86e144f..a858d3e 100644 --- a/sw/CppunitTest_sw_filters_test.mk +++ b/sw/CppunitTest_sw_filters_test.mk @@ -89,7 +89,8 @@ $(eval $(call gb_CppunitTest_use_components,sw_filters_test,\ ucb/source/core/ucb1 \ ucb/source/ucp/file/ucpfile1 \ unoxml/source/service/unoxml \ -xmlhelp/util/ucpchelp1 \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ + xmlhelp/util/ucpchelp1) \ )) $(eval $(call gb_CppunitTest_use_configuration,sw_filters_test)) commit ff9cca69744b54ca84d98476a9a969d1aa0ff2d3 Author: Tor Lillqvist Date: Mon Apr 9 23:35:59 2012 +0300 I meant DESKTOP, not XMLHELP diff --git a/Module_tail_build.mk b/Module_tail_build.mk index cd69300..a19f71c 100644 --- a/Module_tail_build.mk +++ b/Module_tail_build.mk @@ -92,7 +92,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\ writerfilter \ writerperfect \ xmerge \ - $(if $(filter XMLHELP,$(BUILD_TYPE)), \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ xmlhelp) \ xmloff \ xmlscript \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - cppuhelper/source ios/qa Module_tail_build.mk sal/inc sal/Package_inc.mk sc/source
Module_tail_build.mk |3 -
cppuhelper/source/shlib.cxx| 46
ios/qa/sc/Makefile | 11
ios/qa/sc/filters-test.m | 26 ++-
sal/Package_inc.mk |1
sal/inc/osl/detail/ios-bootstrap.h | 60 ++
sc/source/filter/oox/biffcodec.cxx | 85 -
7 files changed, 125 insertions(+), 107 deletions(-)
New commits:
commit d25ef83c1293f1596d2d2d4d4643e3278959823a
Author: Tor Lillqvist
Date: Mon Apr 9 22:40:58 2012 +0300
Add the lo_get_libmap() for this test app
diff --git a/ios/qa/sc/Makefile b/ios/qa/sc/Makefile
index 5d3bcf5..d46e14e 100644
--- a/ios/qa/sc/Makefile
+++ b/ios/qa/sc/Makefile
@@ -15,6 +15,15 @@ APPDIR=build/Debug-$(PLATFORM)/$(APP).app
# Stuff lifted from solenv/gbuild/platform/IOS_ARM_GCC.mk
+gb_OSDEFS := \
+ -D$(OS) \
+ -D_PTHREADS \
+ -DUNIX \
+ -DUNX \
+ -D_REENTRANT \
+ -DNO_PTHREAD_PRIORITY \
+ $(EXTRA_CDEFS) \
+
gb_OBJC_OBJCXX_COMMON_FLAGS := -fobjc-abi-version=2 -fobjc-legacy-dispatch
-D__IPHONE_OS_VERSION_MIN_REQUIRED=40300 -g
gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_OBJCXXFLAGS := -x objective-c++ $(gb_OBJC_OBJCXX_COMMON_FLAGS)
@@ -36,7 +45,7 @@ all: $(APPDIR)/$(APP) stuff
$(APPDIR)/$(APP): $(SRCS)
mkdir -p $(APPDIR)
- $(CXX) -Wl,-map,$(APP).map.mangled -o $@ $(CFLAGS) $(gb_OBJCXXFLAGS)
$(SRCS) $(LIBS)
+ $(CXX) -Wl,-map,$(APP).map.mangled -o $@ $(gb_OSDEFS) $(CFLAGS)
$(gb_OBJCXXFLAGS) $(SRCS) $(LIBS)
c++filt <$(APP).map.mangled >$(APP).map && rm $(APP).map.mangled
stuff:
diff --git a/ios/qa/sc/filters-test.m b/ios/qa/sc/filters-test.m
index c6650ea..42b0816 100644
--- a/ios/qa/sc/filters-test.m
+++ b/ios/qa/sc/filters-test.m
@@ -35,11 +35,32 @@
#include "cppunit/plugin/TestPlugIn.h"
//#include "cppunit/plugin/PlugInManager.h"
+#include
+
+#ifdef __cplusplus
extern "C" {
-extern CppUnitTestPlugIn *cppunitTestPlugIn(void);
-extern int lo_main(int argc, const char **argv);
+#endif
+
+extern CppUnitTestPlugIn *cppunitTestPlugIn(void);
+extern int lo_main(int argc, const char **argv);
+
+extern void * sc_component_getFactory( const char * pImplName, void *
pServiceManager, void * pRegistryKey );
+
+const lib_to_component_mapping *
+lo_get_libmap(void)
+{
+static lib_to_component_mapping map[] = {
+{ "libsclo.a", sc_component_getFactory },
+{ NULL, NULL }
+};
+
+return map;
}
+#ifdef __cplusplus
+}
+#endif
+
int
main(int argc, char ** argv)
{
@@ -160,4 +181,3 @@ didFinishLaunchingWithOptions: (NSDictionary *)
launchOptions
@end
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-
commit 0b67dd10f858caf46a1d55aff1de319d161f44cf
Author: Tor Lillqvist
Date: Mon Apr 9 22:40:17 2012 +0300
Use lo_get_libmap()
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 8c12784..0627e30 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -46,6 +46,10 @@
#endif
#include
+#ifdef IOS
+#include
+#endif
+
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -463,7 +467,6 @@ extern "C"
extern void * configmgr_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
extern void * fwk_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * i18npool_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
-extern void * sc_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * ucb_component_getFactory( const sal_Char * pImplName, void *
pServiceManager, void * pRegistryKey );
extern void * ucpfile_component_getFactory( const sal_Char * pImplName,
void * pServiceManager, void * pRegistryKey );
}
@@ -523,24 +526,33 @@ Reference< XInterface > SAL_CALL
loadSharedLibComponentFactory(
oslGenericFunction pSym = NULL;
#ifdef DISABLE_DYNLOADING
-if ( rLibName.equals( OUSTR("bootstrap.uno" SAL_DLLEXTENSION)) )
-pSym = (oslGenericFunction) bootstrap_component_getFactory;
-else if ( rLibName.equals( OUSTR("libucb1.a")) )
-pSym = (oslGenericFunction) ucb_component_getFactory;
-else if ( rLibName.equals( OUSTR("configmgr.uno.a")) )
-pSym = (oslGenericFunction) configmgr_component_getFactory;
-else if ( rLibName.equals( OUSTR("libucpfile1.a")) )
-pSym = (oslGenericFunction) ucpfile_component_getFactory;
-else if ( rLibName.equals( OUSTR("libsclo.a")) )
-pSym = (oslGenericFunction) sc_component_getFactory;
-else if ( rLibName.equals( OUSTR("libfwklo.a")) )
-pSym = (oslGenericFunction) fwk_component_getFactory;
-else if ( rLibName.equals( OUSTR("i18npool.uno.a")) )
-pSym = (oslGenericFunction) i18npoo
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source svx/inc svx/source
oox/source/drawingml/customshapeproperties.cxx|1 +
oox/source/token/properties.txt |1 +
svx/inc/svx/EnhancedCustomShape2d.hxx |1 +
svx/inc/svx/svdoashp.hxx |1 +
svx/source/customshapes/EnhancedCustomShape2d.cxx |5 +
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 10 --
svx/source/svdraw/svdoashp.cxx| 12
7 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit d2e74fcd33c36d190c0cefa9615e810e2e713a24
Author: Muthu Subramanian
Date: Mon Apr 9 18:24:11 2012 +0530
fdo43752: PPTX import fix affected odp imports.
Related bugs: n#719989, n#719997
(cherry picked from commit 1c44b263d789b4c20e9178c6432300e301df94d6)
Signed-off-by: Ivan Timofeev
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 1b0cac2..020d87a 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -158,6 +158,7 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase& /* rFi
aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX );
aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY );
aPropertyMap[ PROP_TextPreRotateAngle ] <<= Any( mnTextRotateAngle );
+aPropertyMap[ PROP_IsPostRotateAngle ] <<= true; // For OpenXML Imports
Sequence< PropertyValue > aSeq =
aPropertyMap.makePropertyValueSequence();
aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index b754f1d..0cc7bf4 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -242,6 +242,7 @@ IsLoaded
IsNumbering
IsOutlineSymbolsSet
IsPlaceholderDependent
+IsPostRotateAngle
IsSharedFormula
IsStartOfNewPage
IsTextWrapped
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx
b/svx/inc/svx/EnhancedCustomShape2d.hxx
index 415385c..0d9da95 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -182,6 +182,7 @@ class EnhancedCustomShape2d : public SfxItemSet
sal_BoolIsFlipVert() { return bFlipV; };
sal_BoolIsFlipHorz() { return bFlipH; };
sal_Int32 GetRotateAngle() { return nRotateAngle; };
+SVX_DLLPUBLIC bool IsPostRotate() const;
SVX_DLLPUBLIC SdrObject*CreateLineGeometry();
SVX_DLLPUBLIC SdrObject*CreateObject( sal_Bool
bLineGeometryNeededOnly );
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 013e150..0f54019 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -145,6 +145,7 @@ public:
sal_Bool IsMirroredX() const;
sal_Bool IsMirroredY() const;
+bool IsPostRotate() const;
void SetMirroredX( const sal_Bool bMirroredX );
void SetMirroredY( const sal_Bool bMirroredY );
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 3e5f340..d0fa902 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2330,6 +2330,11 @@ void EnhancedCustomShape2d::ApplyGluePoints( SdrObject*
pObj )
}
}
+bool EnhancedCustomShape2d::IsPostRotate() const
+{
+return pCustomShapeObj->ISA( SdrObjCustomShape ) ?
((SdrObjCustomShape*)pCustomShapeObj)->IsPostRotate() : false;
+}
+
SdrObject* EnhancedCustomShape2d::CreateLineGeometry()
{
return CreateObject( sal_True );
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index a92a962..b8a2be0 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -276,6 +276,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL
EnhancedCustomShapeEngine::rende
EnhancedCustomShape2d aCustomShape2d( pSdrObjCustomShape );
sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
+bool bPostRotateAngle = aCustomShape2d.IsPostRotate();
sal_Bool bFlipV = aCustomShape2d.IsFlipVert();
sal_Bool bFlipH = aCustomShape2d.IsFlipHorz();
@@ -315,6 +316,11 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL
EnhancedCustomShapeEngine::rende
}
pRenderedShape->Shear(
pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
}
+if( !bPostRotateAngle && nRotateAngle )
+{
+double a = nRotateAngle * F_PI18000;
+pRenderedShape->NbcRotate(
pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
+}
if ( bFlipV )
[Libreoffice-commits] .: 2 commits - editeng/inc editeng/source
editeng/inc/editeng/editobj.hxx | 18 -
editeng/source/editeng/editobj.cxx | 500 +---
editeng/source/editeng/editobj2.hxx | 42 +--
editeng/source/editeng/impedit4.cxx |6
4 files changed, 281 insertions(+), 285 deletions(-)
New commits:
commit 5d2b0f25f14c33c00cbf31d16e50bc9e00d60f06
Author: Kohei Yoshida
Date: Sun Apr 8 13:30:09 2012 -0400
Killed Another instance of svarray.
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index e3c9340..b495efb 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -85,12 +85,12 @@ public:
static EditTextObject* Create( SvStream& rIStream,
SfxItemPool* pGlobalTextObjectPool = 0 );
-virtual sal_uInt16 GetParagraphCount() const;
+virtual size_t GetParagraphCount() const;
-virtual XubString GetText( sal_uInt16 nParagraph ) const;
-virtual voidInsert( const EditTextObject& rObj, sal_uInt16 nPara );
-virtual voidRemoveParagraph( sal_uInt16 nPara );
-virtual EditTextObject* CreateTextObject( sal_uInt16 nPara, sal_uInt16
nParas = 1 ) const;
+virtual String GetText(size_t nParagraph) const;
+virtual void Insert(const EditTextObject& rObj, size_t nPara);
+virtual void RemoveParagraph(size_t nPara);
+virtual EditTextObject* CreateTextObject(size_t nPara, size_t nParas = 1)
const;
virtual sal_BoolHasPortionInfo() const;
virtual voidClearPortionInfo();
@@ -109,12 +109,12 @@ public:
virtual const SvxFieldItem* GetField() const;
virtual sal_BoolHasField( TypeId aType = NULL ) const;
-virtual SfxItemSet GetParaAttribs( sal_uInt16 nPara ) const;
-virtual voidSetParaAttribs( sal_uInt16 nPara, const SfxItemSet&
rAttribs );
+virtual SfxItemSet GetParaAttribs(size_t nPara) const;
+virtual void SetParaAttribs(size_t nPara, const SfxItemSet& rAttribs);
virtual sal_BoolHasStyleSheet( const XubString& rName,
SfxStyleFamily eFamily ) const;
-virtual voidGetStyleSheet( sal_uInt16 nPara, XubString& rName,
SfxStyleFamily& eFamily ) const;
-virtual voidSetStyleSheet( sal_uInt16 nPara, const XubString&
rName, const SfxStyleFamily& eFamily );
+virtual void GetStyleSheet(size_t nPara, String& rName, SfxStyleFamily&
eFamily) const;
+virtual void SetStyleSheet(size_t nPara, const String& rName, const
SfxStyleFamily& eFamily);
virtual sal_BoolChangeStyleSheets( const XubString& rOldName,
SfxStyleFamily eOldFamily,
const XubString& rNewName,
SfxStyleFamily eNewFamily );
virtual voidChangeStyleSheetName( SfxStyleFamily eFamily, const
XubString& rOldName, const XubString& rNewName );
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index a404533..67099ba 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -168,6 +168,11 @@ bool ContentInfo::operator==( const ContentInfo& rCompare
) const
return false;
}
+bool ContentInfo::operator!=(const ContentInfo& rCompare) const
+{
+return !operator==(rCompare);
+}
+
EditTextObject::EditTextObject( sal_uInt16 n)
{
DBG_CTOR( EE_EditTextObject, 0 );
@@ -185,30 +190,30 @@ EditTextObject::~EditTextObject()
DBG_DTOR( EE_EditTextObject, 0 );
}
-sal_uInt16 EditTextObject::GetParagraphCount() const
+size_t EditTextObject::GetParagraphCount() const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
-XubString EditTextObject::GetText( sal_uInt16 /* nParagraph */ ) const
+String EditTextObject::GetText(size_t /* nParagraph */) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
-return XubString();
+return String();
}
-void EditTextObject::Insert( const EditTextObject& /* rObj */, sal_uInt16 /*
nPara */)
+void EditTextObject::Insert(const EditTextObject& /* rObj */, size_t /* nPara
*/)
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
-EditTextObject* EditTextObject::CreateTextObject( sal_uInt16 /*nPara*/,
sal_uInt16 /*nParas*/ ) const
+EditTextObject* EditTextObject::CreateTextObject(size_t /*nPara*/, size_t
/*nParas*/) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return 0;
}
-void EditTextObject::RemoveParagraph( sal_uInt16 /*nPara*/ )
+void EditTextObject::RemoveParagraph(size_t /*nPara*/)
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
}
@@ -264,13 +269,13 @@ sal_Bool EditTextObject::HasField( TypeId /*aType*/ )
const
return false;
}
-SfxItemSet EditTextObject::GetParaAttribs( sal_uInt16 /*nPara*/ ) const
+SfxItemSet EditTextObject::GetParaAttribs(size_t /*nPara*/) const
{
OSL_FAIL( "Virtual method direct from EditTextObject!" );
return SfxItemSet( *(SfxItemPool*)NULL );
}
-void EditText
[Libreoffice-commits] .: binfilter/bf_xmloff
binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 89ce882ec419cdd0f9217b5f491b66fdaee026f1 Author: LuboÅ¡ LuÅák Date: Mon Apr 9 16:29:39 2012 +0200 fix clang compile diff --git a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx index b4d2d13..02b7bd3 100644 --- a/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx +++ b/binfilter/bf_xmloff/source/core/xmloff_xmlexp.cxx @@ -49,6 +49,8 @@ #include "SettingsExportHelper.hxx" +#include "XMLChartPropertySetMapper.hxx" + #include #include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - configure.in scp2/source
configure.in |4 +++-
scp2/source/graphicfilter/module_graphicfilter.scp |3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6cc3499c777bfe07438a24b23bf79ea5c4c2cd74
Author: Rene Engelhard
Date: Mon Apr 9 15:37:03 2012 +0200
fix mysqlcppconn version check
diff --git a/configure.in b/configure.in
index 090c4eb..24d55e4 100644
--- a/configure.in
+++ b/configure.in
@@ -6493,6 +6493,8 @@ if test "$ENABLE_MYSQLC" = "YES"; then
[AC_MSG_ERROR(mysql_driver.h not found. install MySQL C++
Connectivity)], [])
AC_CHECK_LIB([mysqlcppconn], [main], [:],
[AC_MSG_ERROR(MySQL C++ Connectivity lib not found or
functional)], [])
+save_LDFLAGS=$LDFLAGS
+LDFLAGS="$LDFLAGS -lmysqlcppconn"
AC_MSG_CHECKING([version])
AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include
@@ -6510,7 +6512,7 @@ int main(int argc, char **argv) {
]])],[AC_MSG_RESULT(OK)],[AC_MSG_ERROR([not suitable, we need >=
1.0.6])],[])
AC_LANG_POP([C++])
-
+LDFLAGS=$save_LDFLAGS
else
AC_MSG_RESULT([internal])
AC_MSG_CHECKING([for mysqlcppconn module])
commit 28f6fedd11aff6bf3b3579d9101e39560f83113f
Author: Rene Engelhard
Date: Mon Apr 9 15:25:25 2012 +0200
actually add gid_File_Lib_CDRImport to gid_Module_Optional_Grfflt
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp
b/scp2/source/graphicfilter/module_graphicfilter.scp
index 984b247..dd66724 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -34,5 +34,6 @@ Module gid_Module_Optional_Grfflt
ParentID = gid_Module_Optional;
Default = YES;
Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
-gid_File_Lib_VisioImport,
gid_File_Share_Registry_Graphicfilter_Xcd);
+gid_File_Lib_VisioImport, gid_File_Lib_CDRImport,
+ gid_File_Share_Registry_Graphicfilter_Xcd);
End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_svtools binfilter/inc
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx |2 +-
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx|4 ++--
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx |4 ++--
binfilter/bf_svtools/source/config/svt_pathoptions.cxx |6 +++---
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |2 +-
binfilter/inc/bf_svtools/pathoptions.hxx |4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 48d44b8fa4d45754cf1f15f7bab20af20ff69985
Author: Julien Nabet
Date: Mon Apr 9 14:43:39 2012 +0200
s/pathes/paths
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 0fb4b7c..de0bbbe 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -345,7 +345,7 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // Default pathes
+/*N*/ // Default paths
/*N*/ maLibraryPath = SvtPathOptions().GetBasicPath();
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index d8217ff..600fc16 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -215,7 +215,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() :
ConfigItem( ASCII_STR("Office
{
case ::com::sun::star::uno::TypeClass_STRING :
{
-// multi pathes
+// multi paths
if ( pValues[nProp] >>= aTempStr )
aFullPath = aPathOpt.SubstituteVariable( aTempStr
);
else
@@ -227,7 +227,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() :
ConfigItem( ASCII_STR("Office
case ::com::sun::star::uno::TypeClass_SEQUENCE :
{
-// single pathes
+// single paths
aFullPath = OUString();
Sequence < OUString > aList;
if ( pValues[nProp] >>= aList )
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 933d7e1..257d40f 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -146,7 +146,7 @@ struct FactoryInfo
//-
// returns list of properties, which has changed only!
-// We use given value of sNodeBase to build full qualified pathes ...
+// We use given value of sNodeBase to build full qualified paths ...
// Last sign of it must be "/". Beacuse we use it directly, without
any additional things!
css::uno::Sequence< css::beans::PropertyValue > getChangedProperties(
const ::rtl::OUString& sNodeBase )
{
@@ -744,7 +744,7 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName(
const ::rtl::OUString& sN
*//*-*/
void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence<
::rtl::OUString >& lFactories )
{
-// Expand every set node name in lFactories to full qualified pathes to
his properties
+// Expand every set node name in lFactories to full qualified paths to his
properties
// and get right values from configuration.
const css::uno::Sequence< ::rtl::OUString > lProperties =
impl_ExpandSetNames( lFactories );
const css::uno::Sequence< css::uno::Any > lValues = GetProperties(
lProperties );
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index d091052..aa3e187 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -154,7 +154,7 @@ class SvtPathOptions_Impl
public:
SvtPathOptions_Impl();
-// get the pathes, not const because of using a mutex
+// get the paths, not const because of using a mutex
const String& GetPath( SvtPathOptions::Pathes );
const String& GetAddinPath() { return GetPath(
SvtPathOptions::PATH_ADDIN ); }
const String& GetAutoCorrectPath() { return GetPath(
SvtPathOptions::PATH_AUTOCORRECT ); }
@@ -182,7 +182,7 @@ class SvtPathOptions_Impl
const String& GetUIConfigPath() { return GetPath(
SvtPathOptions::PATH_UICONFIG ); }
const String& GetFingerprintPath() { return GetPath(
SvtPathOptions::PATH_FINGERPRINT ); }
-// set the
[Libreoffice-commits] .: oox/source svx/inc svx/source
oox/source/drawingml/customshapeproperties.cxx|1 +
oox/source/token/properties.txt |1 +
svx/inc/svx/EnhancedCustomShape2d.hxx |1 +
svx/inc/svx/svdoashp.hxx |1 +
svx/source/customshapes/EnhancedCustomShape2d.cxx |5 +
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 10 --
svx/source/svdraw/svdoashp.cxx| 11 +++
7 files changed, 28 insertions(+), 2 deletions(-)
New commits:
commit 1c44b263d789b4c20e9178c6432300e301df94d6
Author: Muthu Subramanian
Date: Mon Apr 9 18:24:11 2012 +0530
fdo43752: PPTX import fix affected odp imports.
Related bugs: n#719989, n#719997
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index 071f37a..90c0027 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++ b/oox/source/drawingml/customshapeproperties.cxx
@@ -158,6 +158,7 @@ void CustomShapeProperties::pushToPropSet( const
::oox::core::FilterBase& /* rFi
aPropertyMap[ PROP_MirroredX ] <<= Any( mbMirroredX );
aPropertyMap[ PROP_MirroredY ] <<= Any( mbMirroredY );
aPropertyMap[ PROP_TextPreRotateAngle ] <<= Any( mnTextRotateAngle );
+aPropertyMap[ PROP_IsPostRotateAngle ] <<= true; // For OpenXML Imports
Sequence< PropertyValue > aSeq =
aPropertyMap.makePropertyValueSequence();
aPropSet.setProperty( PROP_CustomShapeGeometry, aSeq );
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 7ad1a4c..a86df72 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -244,6 +244,7 @@ IsLoaded
IsNumbering
IsOutlineSymbolsSet
IsPlaceholderDependent
+IsPostRotateAngle
IsSharedFormula
IsStartOfNewPage
IsTextWrapped
diff --git a/svx/inc/svx/EnhancedCustomShape2d.hxx
b/svx/inc/svx/EnhancedCustomShape2d.hxx
index 415385c..0d9da95 100644
--- a/svx/inc/svx/EnhancedCustomShape2d.hxx
+++ b/svx/inc/svx/EnhancedCustomShape2d.hxx
@@ -182,6 +182,7 @@ class EnhancedCustomShape2d : public SfxItemSet
sal_BoolIsFlipVert() { return bFlipV; };
sal_BoolIsFlipHorz() { return bFlipH; };
sal_Int32 GetRotateAngle() { return nRotateAngle; };
+SVX_DLLPUBLIC bool IsPostRotate() const;
SVX_DLLPUBLIC SdrObject*CreateLineGeometry();
SVX_DLLPUBLIC SdrObject*CreateObject( sal_Bool
bLineGeometryNeededOnly );
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 013e150..0f54019 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -145,6 +145,7 @@ public:
sal_Bool IsMirroredX() const;
sal_Bool IsMirroredY() const;
+bool IsPostRotate() const;
void SetMirroredX( const sal_Bool bMirroredX );
void SetMirroredY( const sal_Bool bMirroredY );
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 3087526..39a7709 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -2332,6 +2332,11 @@ void EnhancedCustomShape2d::ApplyGluePoints( SdrObject*
pObj )
}
}
+bool EnhancedCustomShape2d::IsPostRotate() const
+{
+return pCustomShapeObj->ISA( SdrObjCustomShape ) ?
((SdrObjCustomShape*)pCustomShapeObj)->IsPostRotate() : false;
+}
+
SdrObject* EnhancedCustomShape2d::CreateLineGeometry()
{
return CreateObject( sal_True );
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 3be2cd4..cfb8c41 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -276,6 +276,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL
EnhancedCustomShapeEngine::rende
EnhancedCustomShape2d aCustomShape2d( pSdrObjCustomShape );
sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle();
+bool bPostRotateAngle = aCustomShape2d.IsPostRotate();
sal_Bool bFlipV = aCustomShape2d.IsFlipVert();
sal_Bool bFlipH = aCustomShape2d.IsFlipHorz();
@@ -315,6 +316,11 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL
EnhancedCustomShapeEngine::rende
}
pRenderedShape->Shear(
pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False);
}
+if( !bPostRotateAngle && nRotateAngle )
+{
+double a = nRotateAngle * F_PI18000;
+pRenderedShape->NbcRotate(
pSdrObjCustomShape->GetSnapRect().Center(), nRotateAngle, sin( a ), cos( a ) );
+}
if ( bFlipV )
{
Point aLeft( aRect.Left(), ( aRect.Top() + aRect.Bottom() ) >>
1 );
@@ -327,8 +333,8 @@
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_colorcfg.cxx|2 +- binfilter/bf_svtools/source/config/svt_viewoptions.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 07afc5b2071ff48beb3093536a7ea68273b4e967 Author: Julien Nabet Date: Mon Apr 9 14:06:58 2012 +0200 s/pathes/paths/ diff --git a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx index 45a090e..962954a 100644 --- a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx +++ b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include //Any2Bool #include diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx index 2b78f3a..4699e2d 100644 --- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx +++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/inc canvas/source unusedcode.easy
canvas/inc/canvas/canvastools.hxx | 45
canvas/source/tools/canvastools.cxx | 39 ---
unusedcode.easy |1
3 files changed, 1 insertion(+), 84 deletions(-)
New commits:
commit 161fb1781bec7e587743b7589d00c9eb7fa00ac7
Author: Julien Nabet
Date: Mon Apr 9 13:45:35 2012 +0200
Remove canvas::tools::calcRectToRectTransform
diff --git a/canvas/inc/canvas/canvastools.hxx
b/canvas/inc/canvas/canvastools.hxx
index a1bee2d..1605b66 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -225,60 +225,17 @@ namespace canvas
@param i_Transformation
Transformation to apply to the input rectangle
-@see calcRectToRectTransform()
-
@return a reference to the resulting rectangle
*/
CANVASTOOLS_DLLPUBLIC ::basegfx::B2DRange& calcTransformedRectBounds(
::basegfx::B2DRange& o_Rect,
const
::basegfx::B2DRange& i_Rect,
const
::basegfx::B2DHomMatrix& i_Transformation );
-/** Calc a transform that maps one rectangle on top of
-another.
-
-The method is a kissing cousin to
-calcTransformedRectBounds(). It can be used to modify the
-given transformation matrix, such that it transforms the
-given input rectangle to the given output rectangle,
-changing only translation and scale (if necessary). Thus,
-if you've calculated an output rectangle via
-calcTransformedRectBounds(), you can move and scale that
-rectangle as you like, and have this method calculate the
-required total transformation for it.
-
-@param o_transform
-Output parameter, to receive the resulting transformation
-matrix.
-
-@param i_destRect
-Input parameter, specifies the requested destination
-rectangle. The resulting transformation will exactly map
-the source rectangle to the destination rectangle.
-
-@param i_srcRect
-Input parameter, specifies the original source
-rectangle. The resulting transformation will exactly map
-the source rectangle to the destination rectangle.
-
-@param i_transformation
-The original transformation matrix. This is changed with
-translations and scalings (if necessary), to exactly map
-the source rectangle to the destination rectangle.
-
-@return a reference to the resulting transformation matrix
-
-@see calcTransformedRectBounds()
-*/
-CANVASTOOLS_DLLPUBLIC ::basegfx::B2DHomMatrix&
calcRectToRectTransform( ::basegfx::B2DHomMatrix&o_transform,
- const
::basegfx::B2DRange&i_destRect,
- const
::basegfx::B2DRange&i_srcRect,
- const
::basegfx::B2DHomMatrix&i_transformation );
-
/** Calc a transform that maps the upper, left corner of a
rectangle to the origin.
The method is a specialized version of
-calcRectToRectTransform(), mapping the input rectangle's
+calcRectToRectTransform() (Removed now), mapping the input
rectangle's
the upper, left corner to the origin, and leaving the size
untouched.
diff --git a/canvas/source/tools/canvastools.cxx
b/canvas/source/tools/canvastools.cxx
index a089f54..4a55ad5 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -688,45 +688,6 @@ namespace canvas
return outRect;
}
-::basegfx::B2DHomMatrix& calcRectToRectTransform(
::basegfx::B2DHomMatrix& o_transform,
- const
::basegfx::B2DRange&destRect,
- const
::basegfx::B2DRange&srcRect,
- const
::basegfx::B2DHomMatrix&transformation )
-{
-if( srcRect.isEmpty() ||
-destRect.isEmpty() )
-{
-return o_transform=transformation;
-}
-
-// transform inputRect by transformation
-::basegfx::B2DRectangle aTransformedRect;
-calcTransformedRectBounds( aTransformedRect,
- srcRect,
- transformation );
-
-// now move resulting left,top point of bounds to (0,0)
-basegfx::B2DHomMatrix
aCorrectedTransform(basegfx::tools::cr
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/biffinputstream.hxx|3
sc/source/filter/inc/excelhandlers.hxx | 12
sc/source/filter/inc/pivottablefragment.hxx | 15
sc/source/filter/inc/querytablefragment.hxx | 14
sc/source/filter/inc/sheetdatacontext.hxx | 57 ---
sc/source/filter/inc/workbookhelper.hxx |2
sc/source/filter/oox/biffinputstream.cxx|5
sc/source/filter/oox/excelhandlers.cxx |6
sc/source/filter/oox/pivottablefragment.cxx | 22 -
sc/source/filter/oox/querytablefragment.cxx | 17 -
sc/source/filter/oox/sheetdatacontext.cxx | 429
sc/source/filter/oox/workbookhelper.cxx | 59 ---
unusedcode.easy |9
13 files changed, 650 deletions(-)
New commits:
commit 26398f9dbf7134f79993f2f8258613124ac2483b
Author: Julien Nabet
Date: Mon Apr 9 13:34:35 2012 +0200
cleaning in oox part
diff --git a/sc/source/filter/inc/biffinputstream.hxx
b/sc/source/filter/inc/biffinputstream.hxx
index 47ee2b0..dd931dd 100644
--- a/sc/source/filter/inc/biffinputstream.hxx
+++ b/sc/source/filter/inc/biffinputstream.hxx
@@ -227,9 +227,6 @@ public:
/** Closes the input stream but not the wrapped stream. */
virtual voidclose();
-/** Returns the absolute position in the wrapped binary stream. */
-sal_Int64 tellBase() const;
-
// BinaryInputStream interface (stream read access) ---
/** Reads nBytes bytes to the passed sequence.
diff --git a/sc/source/filter/inc/excelhandlers.hxx
b/sc/source/filter/inc/excelhandlers.hxx
index 2051a55..56e47fd 100644
--- a/sc/source/filter/inc/excelhandlers.hxx
+++ b/sc/source/filter/inc/excelhandlers.hxx
@@ -205,18 +205,6 @@ protected:
//
-/** Fragment handler derived from the WorksheetHelper helper class.
-
-Used to import sheet fragments.
- */
-class BiffWorksheetFragmentBase : public BiffFragmentHandler, public
WorksheetHelper
-{
-protected:
-explicitBiffWorksheetFragmentBase(
-const WorksheetHelper& rHelper,
-const BiffWorkbookFragmentBase& rParent );
-};
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/pivottablefragment.hxx
b/sc/source/filter/inc/pivottablefragment.hxx
index 5053c72..6e09312 100644
--- a/sc/source/filter/inc/pivottablefragment.hxx
+++ b/sc/source/filter/inc/pivottablefragment.hxx
@@ -96,21 +96,6 @@ private:
};
//
-//
-
-class BiffPivotTableContext : public BiffWorksheetContextBase
-{
-public:
-explicitBiffPivotTableContext( const WorksheetHelper& rHelper
);
-
-/** Imports all records related to the current pivot table. */
-virtual voidimportRecord( BiffInputStream& rStrm );
-
-private:
-PivotTable& mrPivotTable;
-};
-
-//
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/querytablefragment.hxx
b/sc/source/filter/inc/querytablefragment.hxx
index 5609eb0..5a01a04 100644
--- a/sc/source/filter/inc/querytablefragment.hxx
+++ b/sc/source/filter/inc/querytablefragment.hxx
@@ -57,20 +57,6 @@ private:
//
-class BiffQueryTableContext : public BiffWorksheetContextBase
-{
-public:
-explicitBiffQueryTableContext( const WorksheetHelper& rHelper
);
-
-/** Imports all records related to the current query table. */
-virtual voidimportRecord( BiffInputStream& rStrm );
-
-private:
-QueryTable& mrQueryTable;
-};
-
-//
-
} // namespace xls
} // namespace oox
diff --git a/sc/source/filter/inc/sheetdatacontext.hxx
b/sc/source/filter/inc/sheetdatacontext.hxx
index 324b12a..05c8768 100644
--- a/sc/source/filter/inc/sheetdatacontext.hxx
+++ b/sc/source/filter/inc/sheetdatacontext.hxx
@@ -130,63 +130,6 @@ private:
//
-/** This class implements importing row settings and all cells of a sheet.
- */
-class BiffSheetDataContext : public BiffWorksheetContextBase, private
SheetDataContextBase
-{
-public:
-explicitBiffSheetDataContext( const WorksheetHelper& rHelper );
-
-/** Tries to import a sheet data record. */
-virtual voidimportRecord( BiffInputStream& rStrm );
-
-private:
-/** Imports row settings from a ROW record. */
-voidimportRow( BiffInputStream& rStrm );
-
-/** Reads an XF identifier and initializes a new cell. */
-boolreadCellXfId( BiffInputStream& rStrm, con
[Libreoffice-commits] .: 3 commits - filter/source framework/inc framework/source svtools/source sw/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source
filter/source/config/cache/cacheupdatelistener.cxx |2
filter/source/config/cache/filtercache.cxx |2
framework/inc/jobs/jobdispatch.hxx |2
framework/source/accelerators/acceleratorconfiguration.cxx |2
framework/source/fwi/classes/protocolhandlercache.cxx |8
framework/source/fwi/jobs/configaccess.cxx |2
framework/source/jobs/jobdata.cxx |2
framework/source/jobs/jobexecutor.cxx |2
framework/source/services/pathsettings.cxx |2
svtools/source/config/colorcfg.cxx |2
svtools/source/config/extcolorcfg.cxx |2
sw/source/ui/envelp/labelcfg.cxx |2
unotools/Library_utl.mk|2
unotools/Package_inc.mk|2
unotools/inc/unotools/configpathes.hxx | 183 ---
unotools/inc/unotools/configpaths.hxx | 183 +++
unotools/inc/unotools/pathoptions.hxx |4
unotools/source/config/configitem.cxx |2
unotools/source/config/confignode.cxx |2
unotools/source/config/configpathes.cxx| 309 -
unotools/source/config/configpaths.cxx | 309 +
unotools/source/config/defaultoptions.cxx |2
unotools/source/config/fontcfg.cxx |2
unotools/source/config/pathoptions.cxx | 16
unotools/source/config/viewoptions.cxx |2
25 files changed, 524 insertions(+), 524 deletions(-)
New commits:
commit 238ad07d7aa56231ff1a6f812656f89f1c193d73
Author: Tor Lillqvist
Date: Mon Apr 9 13:53:34 2012 +0300
s/pathes/paths/
diff --git a/unotools/inc/unotools/pathoptions.hxx
b/unotools/inc/unotools/pathoptions.hxx
index 2ed1178..d74e4ae 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.hxx
@@ -44,7 +44,7 @@ private:
SvtPathOptions_Impl*pImp;
public:
-enum Pathes
+enum Paths
{
PATH_ADDIN,
PATH_AUTOCORRECT,
@@ -129,7 +129,7 @@ public:
String SubstituteVariable( const String& rVar ) const;
String ExpandMacros( const String& rPath ) const;
String UseVariable( const String& rVar ) const;
-sal_BoolSearchFile( String& rIniFile, Pathes ePath =
PATH_USERCONFIG );
+sal_BoolSearchFile( String& rIniFile, Paths ePath =
PATH_USERCONFIG );
::com::sun::star::lang::Locale GetLocale() const;
sal_BoolIsReadonly() const;
};
diff --git a/unotools/source/config/defaultoptions.cxx
b/unotools/source/config/defaultoptions.cxx
index cb68c88..90261df 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.cxx
@@ -118,7 +118,7 @@ typedef String SvtDefaultOptions_Impl:: *PathStrPtr;
struct PathToDefaultMapping_Impl
{
-SvtPathOptions::Pathes _ePath;
+SvtPathOptions::Paths _ePath;
PathStrPtr _pDefaultPath;
};
diff --git a/unotools/source/config/pathoptions.cxx
b/unotools/source/config/pathoptions.cxx
index f743bf7..4435830 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -130,7 +130,7 @@ class SvtPathOptions_Impl
SvtPathOptions_Impl();
// get the paths, not const because of using a mutex
-const String& GetPath( SvtPathOptions::Pathes );
+const String& GetPath( SvtPathOptions::Paths );
const String& GetAddinPath() { return GetPath(
SvtPathOptions::PATH_ADDIN ); }
const String& GetAutoCorrectPath() { return GetPath(
SvtPathOptions::PATH_AUTOCORRECT ); }
const String& GetAutoTextPath() { return GetPath(
SvtPathOptions::PATH_AUTOTEXT ); }
@@ -157,7 +157,7 @@ class SvtPathOptions_Impl
const String& GetFingerprintPath() { return GetPath(
SvtPathOptions::PATH_FINGERPRINT ); }
// set the paths
-voidSetPath( SvtPathOptions::Pathes, const String&
rNewPath );
+voidSetPath( SvtPathOptions::Paths, const String& rNewPath
);
voidSetAddinPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_ADDIN, rPath ); }
voidSetAutoCorrectPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_AUTOCORRECT, rPath ); }
voidSetAutoTextPath( const String& rPath ) { SetPath(
SvtPathOptions::PATH_AUTOTEXT, rPath ); }
@@ -197,7 +197,7 @@ static sal_Int32 nRefCount = 0;
struct PropertyStruct
{
const char* pPropName; // The ascii name of the Office path
-SvtPathOptions::Pathes ePath; // The enum value used by
SvtPathOptions
+SvtPat
[Libreoffice-commits] .: sc/source sd/source unusedcode.easy
sc/source/filter/inc/numberformatsbuffer.hxx |2
sc/source/filter/inc/pivotcachebuffer.hxx |2
sc/source/filter/inc/scenariobuffer.hxx|2
sc/source/filter/inc/stylesbuffer.hxx |5
sc/source/filter/oox/numberformatsbuffer.cxx | 28 ---
sc/source/filter/oox/pivotcachebuffer.cxx | 30 ---
sc/source/filter/oox/scenariobuffer.cxx| 11 -
sc/source/filter/oox/stylesbuffer.cxx | 152 -
sd/source/ui/inc/View.hxx |2
sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx | 37
sd/source/ui/slidesorter/cache/SlsGenericPageCache.hxx |6
sd/source/ui/view/sdview4.cxx | 53 -
unusedcode.easy|6
13 files changed, 336 deletions(-)
New commits:
commit b42c792f50ed11a3efc9c20a4e7eed5163fdaed7
Author: Julien Nabet
Date: Mon Apr 9 13:00:31 2012 +0200
Remove some unused methods
diff --git a/sc/source/filter/inc/numberformatsbuffer.hxx
b/sc/source/filter/inc/numberformatsbuffer.hxx
index 6df9586..ac9a63b 100644
--- a/sc/source/filter/inc/numberformatsbuffer.hxx
+++ b/sc/source/filter/inc/numberformatsbuffer.hxx
@@ -111,8 +111,6 @@ public:
NumberFormatRef importNumFmt( const AttributeList& rAttribs );
/** Inserts a new number format code from a NUMFMT record. */
voidimportNumFmt( SequenceInputStream& rStrm );
-/** Inserts a new number format code from a FORMAT record. */
-voidimportFormat( BiffInputStream& rStrm );
/** Final processing after import of all style settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx
b/sc/source/filter/inc/pivotcachebuffer.hxx
index 7e7c16f..2fd32fe 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -414,8 +414,6 @@ public:
/** Reads sheet source settings from the PCDSHEETSOURCE record. */
voidimportPCDSheetSource( SequenceInputStream& rStrm,
const ::oox::core::Relations& rRelations );
-/** Reads cache source settings from the PCDSOURCE record. */
-voidimportPCDSource( BiffInputStream& rStrm );
/** Reads pivot cache global settings from the PCDEFINITION record. */
voidimportPCDefinition( BiffInputStream& rStrm );
diff --git a/sc/source/filter/inc/scenariobuffer.hxx
b/sc/source/filter/inc/scenariobuffer.hxx
index dc996c7..4205d8b 100644
--- a/sc/source/filter/inc/scenariobuffer.hxx
+++ b/sc/source/filter/inc/scenariobuffer.hxx
@@ -114,8 +114,6 @@ public:
voidimportScenarios( const AttributeList& rAttribs );
/** Imports sheet scenario settings from a SCENARIOS record. */
voidimportScenarios( SequenceInputStream& rStrm );
-/** Imports sheet scenario settings from a SCENARIOS record. */
-voidimportScenarios( BiffInputStream& rStrm );
/** Creates and returns a new scenario in this collection. */
Scenario& createScenario();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 409af4d..07f2a7a 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -280,8 +280,6 @@ public:
/** Imports a font style flag from a DXF record. */
voidimportDxfFlag( sal_Int32 nElement,
SequenceInputStream& rStrm );
-/** Imports the FONT record from the passed stream. */
-voidimportFont( BiffInputStream& rStrm );
/** Imports the FONTCOLOR record from the passed stream. */
voidimportFontColor( BiffInputStream& rStrm );
/** Sets the font attributes from the font block of a CFRULE record. */
@@ -783,9 +781,6 @@ public:
/** Imports the XF record from the passed stream. */
voidimportXf( SequenceInputStream& rStrm, bool bCellXf );
-/** Imports the XF record from the passed stream. */
-voidimportXf( BiffInputStream& rStrm );
-
/** Final processing after import of all style settings. */
voidfinalizeImport();
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 1eab9e5..5133a91 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2019,34 +2019,6 @@ void NumberFormatsBuffer::importNumFmt(
SequenceInputStream& rStrm )
createNumFmt( nNumFmtId, aFmtCode );
}
-void NumberFormatsBuffer::importFormat( BiffInputStream& rStrm )
-{
-OUString aFmtCode;
-switch( getBiff() )
-{
-case BIFF2:
-case BIFF3:
-aFmtCode = rStrm.readByteStringUC( false, getTextEncoding() );
-break;
-case BIFF4:
-
[Libreoffice-commits] .: sc/source unusedcode.easy
sc/source/filter/inc/commentsbuffer.hxx |2 --
sc/source/filter/inc/condformatbuffer.hxx |2 --
sc/source/filter/inc/stylesbuffer.hxx |2 --
sc/source/filter/oox/commentsbuffer.cxx | 29 -
sc/source/filter/oox/condformatbuffer.cxx |5 -
sc/source/filter/oox/stylesbuffer.cxx | 15 ---
unusedcode.easy |3 ---
7 files changed, 58 deletions(-)
New commits:
commit b3e2cbc68f3501d3925f8789b1addc8ad4f8e9c0
Author: Julien Nabet
Date: Mon Apr 9 11:37:16 2012 +0200
Dump other unused functions in oox
diff --git a/sc/source/filter/inc/commentsbuffer.hxx
b/sc/source/filter/inc/commentsbuffer.hxx
index 81143a9..9827b82 100644
--- a/sc/source/filter/inc/commentsbuffer.hxx
+++ b/sc/source/filter/inc/commentsbuffer.hxx
@@ -73,8 +73,6 @@ public:
voidimportCommentPr( const AttributeList& rAttribs );
/** Imports a cell comment from the passed stream of a COMMENT record. */
voidimportComment( SequenceInputStream& rStrm );
-/** Imports a cell comment from the passed stream of a NOTE record. */
-voidimportNote( BiffInputStream& rStrm );
/** Creates and returns a new rich-string object for the comment text. */
RichStringRef createText();
diff --git a/sc/source/filter/inc/condformatbuffer.hxx
b/sc/source/filter/inc/condformatbuffer.hxx
index 393a9d0..e236375 100644
--- a/sc/source/filter/inc/condformatbuffer.hxx
+++ b/sc/source/filter/inc/condformatbuffer.hxx
@@ -168,8 +168,6 @@ public:
CondFormatRef importConditionalFormatting( const AttributeList&
rAttribs );
/** Imports settings from the CONDFORMATTING record. */
CondFormatRef importCondFormatting( SequenceInputStream& rStrm );
-/** Imports settings from the CFHEADER record. */
-voidimportCfHeader( BiffInputStream& rStrm );
/** Creates all conditional formatting in the Calc document. */
voidfinalizeImport();
diff --git a/sc/source/filter/inc/stylesbuffer.hxx
b/sc/source/filter/inc/stylesbuffer.hxx
index 22af2be..409af4d 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -148,8 +148,6 @@ public:
voidimportPaletteColor( const AttributeList& rAttribs );
/** Appends a new color from the passed RGBCOLOR record. */
voidimportPaletteColor( SequenceInputStream& rStrm );
-/** Imports the PALETTE record from the passed stream. */
-voidimportPalette( BiffInputStream& rStrm );
/** Rturns the RGB value of the color with the passed index. */
sal_Int32 getColor( sal_Int32 nPaletteIdx ) const;
diff --git a/sc/source/filter/oox/commentsbuffer.cxx
b/sc/source/filter/oox/commentsbuffer.cxx
index a1bef7d..0ea4ca2 100644
--- a/sc/source/filter/oox/commentsbuffer.cxx
+++ b/sc/source/filter/oox/commentsbuffer.cxx
@@ -145,35 +145,6 @@ void Comment::importComment( SequenceInputStream& rStrm )
getAddressConverter().convertToCellRangeUnchecked( maModel.maRange,
aBinRange, getSheetIndex() );
}
-void Comment::importNote( BiffInputStream& rStrm )
-{
-BinAddress aBinAddr;
-rStrm >> aBinAddr;
-// cell range will be checked while inserting the comment into the document
-getAddressConverter().convertToCellRangeUnchecked( maModel.maRange,
BinRange( aBinAddr ), getSheetIndex() );
-
-// remaining record data is BIFF dependent
-switch( getBiff() )
-{
-case BIFF2:
-case BIFF3:
-importNoteBiff2( rStrm );
-break;
-case BIFF4:
-case BIFF5:
-importNoteBiff2( rStrm );
-// in BIFF4 and BIFF5, comments can have an associated sound
-if( (rStrm.getNextRecId() == BIFF_ID_NOTESOUND) &&
rStrm.startNextRecord() )
-importNoteSound( rStrm );
-break;
-case BIFF8:
-importNoteBiff8( rStrm );
-break;
-case BIFF_UNKNOWN:
-break;
-}
-}
-
RichStringRef Comment::createText()
{
maModel.mxText.reset( new RichString( *this ) );
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index b10210f..2985a8f 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -735,11 +735,6 @@ CondFormatRef CondFormatBuffer::importCondFormatting(
SequenceInputStream& rStrm
return xCondFmt;
}
-void CondFormatBuffer::importCfHeader( BiffInputStream& rStrm )
-{
-createCondFormat()->importCfHeader( rStrm );
-}
-
void CondFormatBuffer::finalizeImport()
{
maCondFormats.forEachMem( &CondFormat::finalizeImport );
diff --git a/sc/source/filter/oox/stylesbuffer.cxx
b/sc/source/filter/oox/stylesbuffer.cxx
index 11a5608..26b146a 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -550,21
[Libreoffice-commits] .: 3 commits - basctl/AllLangResTarget_basctl.mk basic/AllLangResTarget_sb.mk chart2/AllLangResTarget_chartcontroller.mk cui/AllLangResTarget_cui.mk dbaccess/AllLangResTarget_dba
basctl/AllLangResTarget_basctl.mk | 13 + basic/AllLangResTarget_sb.mk |7 +++ chart2/AllLangResTarget_chartcontroller.mk | 10 +- cui/AllLangResTarget_cui.mk|8 dbaccess/AllLangResTarget_dba.mk |4 dbaccess/AllLangResTarget_dbmm.mk |4 ++-- dbaccess/AllLangResTarget_dbu.mk | 12 +--- dbaccess/AllLangResTarget_dbui.mk | 12 +--- dbaccess/AllLangResTarget_sdbt.mk |6 -- dbaccess/Library_dbu.mk| 12 ++-- desktop/AllLangResTarget_dkt.mk|4 ++-- editeng/AllLangResTarget_editeng.mk|4 extensions/AllLangResTarget_abp.mk |4 extensions/AllLangResTarget_bib.mk |7 +++ extensions/AllLangResTarget_dbp.mk |4 filter/AllLangResTarget_pdffilter.mk |4 filter/AllLangResTarget_xsltdlg.mk |4 forms/AllLangResTarget_frm.mk |4 formula/AllLangResTarget_for.mk|6 +- formula/AllLangResTarget_forui.mk |4 fpicker/AllLangResTarget_fps_office.mk |5 +++-- framework/AllLangResTarget_fwe.mk |4 padmin/AllLangResTarget_spa.mk |4 reportdesign/AllLangResTarget_rpt.mk |7 +-- reportdesign/AllLangResTarget_rptui.mk | 10 -- sc/AllLangResTarget_sc.mk | 12 ++-- sd/AllLangResTarget_sd.mk | 14 +++--- sfx2/AllLangResTarget_sfx2.mk |8 +++- solenv/gbuild/AllLangResTarget.mk | 15 +++ solenv/gbuild/TargetLocations.mk |4 +++- starmath/AllLangResTarget_sm.mk|9 +++-- svl/AllLangResTarget_svl.mk|5 ++--- svtools/AllLangResTarget_svt.mk|7 +++ svx/AllLangResTarget_gal.mk|7 +++ svx/AllLangResTarget_ofa.mk| 10 +++--- svx/AllLangResTarget_svx.mk| 12 +++- svx/AllLangResTarget_textconversiondlgs.mk |5 ++--- svx/Package_globlmn_hrc.mk |2 +- sw/AllLangResTarget_sw.mk | 12 ++-- uui/AllLangResTarget_uui.mk|6 ++ vcl/AllLangResTarget_vcl.mk|4 wizards/AllLangResTarget_cal.mk|4 wizards/AllLangResTarget_dbw.mk|4 wizards/AllLangResTarget_eur.mk|4 wizards/AllLangResTarget_imp.mk|4 wizards/AllLangResTarget_tpl.mk|4 wizards/AllLangResTarget_wwz.mk|4 wizards/AllLangResTarget_wzi.mk|4 xmlsecurity/AllLangResTarget_xsec.mk |5 + 49 files changed, 240 insertions(+), 88 deletions(-) New commits: commit 2753a9904ce4caeeacca5eb2987319dc179c428b Author: David Tardon Date: Mon Apr 9 10:08:01 2012 +0200 do not put things directly into $(WORKDIR) diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index b72a07a..ec8dd82 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -49,7 +49,7 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\ -I$(SRCDIR)/chart2/source/controller/inc \ -I$(SRCDIR)/chart2/source/controller/main \ -I$(SRCDIR)/chart2/source/inc \ --I$(WORKDIR)/inc/chart2 \ +-I$(call gb_SrsTemplateTarget_get_include_dir,chart2) \ )) $(eval $(call gb_SrsTarget_add_files,chart2/res,\ diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk index a8e17f8..1e353af 100644 --- a/dbaccess/AllLangResTarget_dbu.mk +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -45,7 +45,7 @@ $(eval $(call gb_SrsTarget_use_packages,dbaccess/dbu,\ $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ $$(INCLUDE) \ --I$(WORKDIR)/inc/dbaccess \ + -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \ -I$(SRCDIR)/dbaccess/inc \ -I$(SRCDIR)/dbaccess/source/ui/inc \ )) diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk index c22b4d1..fe37557 100644 --- a/dbaccess/AllLangResTarget_dbui.mk +++ b/dbaccess/AllLangResTarget_dbui.mk @@ -44,7 +44,7 @@ $(eval $(call gb_SrsTarget_use_package,dbaccess/dbui,\ $(eval $(call gb_SrsTarget_set_include,dbaccess/dbui,\ $$(INCLUDE) \ - -I$(WORKDIR)/inc/dbaccess \ + -I$(call gb_SrsTemplateTarget_get_include_dir,dbaccess) \ -I$(SRCDIR)/dbaccess/source/ui/inc \ -I$(SRCDIR)/dbaccess/source/ui/dlg \ -I$(SRCDIR)/dbaccess/inc \ diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk index 727568e..44d75b5 100644 --- a/dbaccess/Library_dbu.mk +++ b/dbaccess/Library_dbu.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_include,dbu,\ -I$(SRC
