[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLHelper.cxx |4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit bf5a6730a50cc089d32be5168ca4925910974e0c
Author: Tor Lillqvist
Date: Tue Apr 15 09:53:30 2014 +0300
Avoid complex static global initialisation
Caused an assertion failure: "sal/osl/unx/process_impl.cxx:167: sal_uInt32
osl_getCommandArgCount(): Assertion `g_command_args.m_nCount != 0' failed".
Change-Id: Ib01e0312e328f751c9353aab95dceb977b818b0c
diff --git a/vcl/source/opengl/OpenGLHelper.cxx
b/vcl/source/opengl/OpenGLHelper.cxx
index 75eefe7..0042231 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -25,11 +25,9 @@ OUString getShaderFolder()
return aUrl + "/opengl/";
}
-OUString maShaderFolder = getShaderFolder();
-
OString loadShader(const OUString& rFilename)
{
-OUString aFileURL = maShaderFolder + rFilename +".glsl";
+OUString aFileURL = getShaderFolder() + rFilename +".glsl";
osl::File aFile(aFileURL);
if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/NumberingManager.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 26d88611665423a5662394af684c7e3f20b0dd6d
Author: Stephan Bergmann
Date: Tue Apr 15 08:42:43 2014 +0200
Properly #ifdef debug-only code
Change-Id: Iebf7ed1fb034ab2c2bee36ca6bf23408bf060d8d
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 036a4ec..da88e52 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -48,6 +48,7 @@ namespace dmapper {
//--- Utility functions
+#if OSL_DEBUG_LEVEL > 1
void lcl_printProperties( uno::Sequence< beans::PropertyValue > aProps )
{
sal_Int32 nLen = aProps.getLength( );
@@ -63,6 +64,7 @@ void lcl_printProperties( uno::Sequence< beans::PropertyValue
> aProps )
SAL_INFO("writerfilter", "Property " << aProps[i].Name << ": " <<
sValue);
}
}
+#endif
sal_Int32 lcl_findProperty( uno::Sequence< beans::PropertyValue > aProps,
const OUString& sName )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: uui/source
uui/source/interactionhandler.cxx |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
New commits:
commit f1433c21b14fd8d3419e45ed80e42a140ff1129c
Author: Stephan Bergmann
Date: Tue Apr 15 08:39:28 2014 +0200
Clean up function declarations
Change-Id: Ie9081e6ed0840fad98f52f9755767788db77f406
diff --git a/uui/source/interactionhandler.cxx
b/uui/source/interactionhandler.cxx
index c95e0e3..1cded67 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
+#include
#include
#include
#include
@@ -34,14 +37,12 @@ namespace {
class UUIInteractionHandler:
public cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
com::sun::star::lang::XInitialization,
- com::sun::star::task::XInteractionHandler2 >
+ com::sun::star::task::XInteractionHandler2 >,
+private boost::noncopyable
{
private:
UUIInteractionHelper * m_pImpl;
-UUIInteractionHandler(UUIInteractionHandler &); // not implemented
-void operator =(UUIInteractionHandler); // not implemented
-
public:
UUIInteractionHandler(com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext >
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unoxml/source
unoxml/source/rdf/CBlankNode.cxx |7 +++
unoxml/source/rdf/CLiteral.cxx |7 +++
unoxml/source/rdf/CURI.cxx |7 +++
3 files changed, 9 insertions(+), 12 deletions(-)
New commits:
commit f981c42edac92ac03dd04e87baab238b84963de5
Author: Stephan Bergmann
Date: Tue Apr 15 08:37:14 2014 +0200
Clean up function declarations
Change-Id: I1be08414e3c816f01a9712eeb9474acc16838389
diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx
index 1d1e7b6..2c16ee4 100644
--- a/unoxml/source/rdf/CBlankNode.cxx
+++ b/unoxml/source/rdf/CBlankNode.cxx
@@ -19,6 +19,7 @@
#include "CNodes.hxx"
+#include
#include
#include
#include
@@ -35,7 +36,8 @@ class CBlankNode:
public ::cppu::WeakImplHelper3<
css::lang::XServiceInfo,
css::lang::XInitialization,
-css::rdf::XBlankNode>
+css::rdf::XBlankNode>,
+private boost::noncopyable
{
public:
explicit CBlankNode(css::uno::Reference< css::uno::XComponentContext >
const & context);
@@ -53,9 +55,6 @@ public:
virtual OUString SAL_CALL getStringValue() throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
-CBlankNode(const CBlankNode &); // not defined
-CBlankNode& operator=(const CBlankNode &); // not defined
-
css::uno::Reference< css::uno::XComponentContext > m_xContext;
OUString m_NodeID;
diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx
index 6d69fac..5fd0bef 100644
--- a/unoxml/source/rdf/CLiteral.cxx
+++ b/unoxml/source/rdf/CLiteral.cxx
@@ -19,6 +19,7 @@
#include "CNodes.hxx"
+#include
#include
#include
#include
@@ -37,7 +38,8 @@ class CLiteral:
public ::cppu::WeakImplHelper3<
css::lang::XServiceInfo,
css::lang::XInitialization,
-css::rdf::XLiteral>
+css::rdf::XLiteral>,
+private boost::noncopyable
{
public:
explicit CLiteral(css::uno::Reference< css::uno::XComponentContext > const
& context);
@@ -60,9 +62,6 @@ public:
virtual css::uno::Reference< css::rdf::XURI > SAL_CALL getDatatype() throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
-CLiteral(const CLiteral &); // not defined
-CLiteral& operator=(const CLiteral &); // not defined
-
css::uno::Reference< css::uno::XComponentContext > m_xContext;
OUString m_Value;
diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx
index 6ddd1c6..228af1c 100644
--- a/unoxml/source/rdf/CURI.cxx
+++ b/unoxml/source/rdf/CURI.cxx
@@ -19,6 +19,7 @@
#include "CNodes.hxx"
+#include
#include
#include
#include
@@ -36,7 +37,8 @@ class CURI:
public ::cppu::WeakImplHelper3<
css::lang::XServiceInfo,
css::lang::XInitialization,
-css::rdf::XURI>
+css::rdf::XURI>,
+private boost::noncopyable
{
public:
explicit CURI(css::uno::Reference< css::uno::XComponentContext > const &
context);
@@ -58,9 +60,6 @@ public:
virtual OUString SAL_CALL getNamespace() throw
(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
-CURI(const CURI &); // not defined
-CURI& operator=(const CURI &); // not defined
-
/// handle css.rdf.URIs
void SAL_CALL initFromConstant(const sal_Int16 i_Constant);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: ucb/source
ucb/source/ucp/ftp/ftpdirp.cxx |7 ---
ucb/source/ucp/hierarchy/hierarchydatasource.cxx |4
2 files changed, 11 deletions(-)
New commits:
commit 74649d4c397134348cedd1d9da6d2b66b9a4970f
Author: Stephan Bergmann
Date: Tue Apr 15 08:32:38 2014 +0200
Remove unused code
Change-Id: Ia0770853b378dd209402f030fe2380ba44a1578f
diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index 87f38b8..49a659c 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -31,13 +31,6 @@ using namespace ftp;
typedef sal_uInt32 ULONG;
-
-inline sal_Bool ascii_isLetter( sal_Unicode ch )
-{
-return (( (ch >= 0x0041) && (ch <= 0x005A)) ||
-(( ch >= 0x0061) && (ch <= 0x007A)));
-}
-
inline sal_Bool ascii_isWhitespace( sal_Unicode ch )
{
return ((ch <= 0x20) && ch);
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 9b6844f..325841d 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -118,10 +118,6 @@ public:
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
-static css::uno::Reference< css::lang::XSingleServiceFactory >
-createServiceFactory( const css::uno::Reference<
- css::lang::XMultiServiceFactory >& rxServiceMgr );
-
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
LibreOffice Gerrit News for core on 2014-04-15
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + Simplify the AttributeOutputBase::OutputFlyFrame method. in https://gerrit.libreoffice.org/9006 from Chris Laplante about module sw + fdo#62957 FILESAVE: Save Last Slide Position in Impress in https://gerrit.libreoffice.org/8946 from Sujay m about module sd End of freshness + cppcheck: multiCondition, second test should be DataOutputStream in https://gerrit.libreoffice.org/9007 from Julien Nabet about module extensions + Split outdev5.cxx and outdev6.cxx in https://gerrit.libreoffice.org/9004 from Chris Sherlock about module vcl + Split outdev3.cxx in https://gerrit.libreoffice.org/9003 from Chris Sherlock about module include, vcl + Split outdev2.cxx in https://gerrit.libreoffice.org/9002 from Chris Sherlock about module include, vcl + Move lines and rectangles to seperate source files in https://gerrit.libreoffice.org/9001 from Chris Sherlock about module vcl + Move line functions into line.cxx and polyline.cxx in https://gerrit.libreoffice.org/9000 from Chris Sherlock about module vcl + Remove unnecessary headers from polygon.cxx in https://gerrit.libreoffice.org/8999 from Chris Sherlock about module vcl + Remove unnecessary includes from hatch.cxx in https://gerrit.libreoffice.org/8998 from Chris Sherlock about module vcl + Remove unnecessary includes from gradient.cxx in https://gerrit.libreoffice.org/8997 from Chris Sherlock about module vcl + Move bezier functions into own source file bezier.cxx in https://gerrit.libreoffice.org/8996 from Chris Sherlock about module include, vcl + Don't forget to add polygon as an object in the makefile! in https://gerrit.libreoffice.org/8995 from Chris Sherlock about module include, vcl + Rename ImplGetGradientColorValue in https://gerrit.libreoffice.org/8994 from Chris Sherlock about module vcl + Change acessibility level for private functions in https://gerrit.libreoffice.org/8993 from Chris Sherlock about module include, vcl + Reorganize locations of functions in gradient.cxx in https://gerrit.libreoffice.org/8992 from Chris Sherlock about module vcl + Move hatch functions to own source file. in https://gerrit.libreoffice.org/8991 from Chris Sherlock about module vcl + Fix typo in https://gerrit.libreoffice.org/8990 from Chris Sherlock about module vcl + Move OutputDevice polygon funcs to vcl/source/gdi/outdev/polygon.cxx in https://gerrit.libreoffice.org/8989 from Chris Sherlock about module vcl + Move OutputDevice gradient funcs to vcl/source/gdi/outdev/gradient.cxx in https://gerrit.libreoffice.org/8988 from Chris Sherlock about module vcl + Rearrange position of gradient functions in outdev4.cxx in https://gerrit.libreoffice.org/8987 from Chris Sherlock about module vcl + Move OutputDevice source files to vcl/source/gdi/outdev in https://gerrit.libreoffice.org/8986 from Chris Sherlock about module vcl + Move lines and rectangles to seperate source files in https://gerrit.libreoffice.org/8966 from Chris Sherlock about module vcl + Move line functions into line.cxx and polyline.cxx in https://gerrit.libreoffice.org/8965 from Chris Sherlock about module vcl + Remove unnecessary headers from polygon.cxx in https://gerrit.libreoffice.org/8964 from Chris Sherlock about module vcl + Remove unnecessary includes from hatch.cxx in https://gerrit.libreoffice.org/8963 from Chris Sherlock about module vcl + Remove unnecessary includes from gradient.cxx in https://gerrit.libreoffice.org/8962 from Chris Sherlock about module vcl + Move bezier functions into own source file bezier.cxx in https://gerrit.libreoffice.org/8961 from Chris Sherlock about module include, vcl + Don't forget to add polygon as an object in the makefile! in https://gerrit.libreoffice.org/8960 from Chris Sherlock about module include, vcl + Rename ImplGetGradientColorValue in https://gerrit.libreoffice.org/8959 from Chris Sherlock about module vcl + Change acessibility level for private functions in https://gerrit.libreoffice.org/8958 from Chris Sherlock about module include, vcl + Reorganize locations of functions in gradient.cxx in https://gerrit.libreoffice.org/8957 from Chris Sherlock about module vcl + Move hatch functions to own source file. in https://gerrit.libreoffice.org/8956 from Chris Sherlock about module vcl + Fix typo in https://gerrit.libreoffice.org/8955 from Chris Sherlock about module vcl + Move OutputDevice polygon funcs to vcl/source/gdi/outdev/polygon.cxx in https://gerrit.libreoffice.org/8954 from Chris Sherlock about module vcl + Move OutputDevice gradient funcs to vcl/source/gdi/outdev/gradient.cxx in https://gerrit.libreoffice.org/8953 from Chris Sherlock about module vcl + Rearrange position of gradient functions in outdev4.cxx in https://gerrit.libreoffice.org/8952 from Chris Sherlock
LibreOffice Gerrit News for submodules on 2014-04-15
Moin! ~~ Project dictionaries ~~ Nothing moved in the project for the last 25 hours ~~ Project translations ~~ Nothing moved in the project for the last 25 hours ~~ Project help ~~ * Open changes on master for project help changed in the last 25 hours: + update word counting in https://gerrit.libreoffice.org/8968 from Stanislav Horáček * Merged changes on master for project help changed in the last 25 hours: None * Abandoned changes on master for project help changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/svx
include/svx/svdoopengl.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c2ffc9e180d387359d9c465770db3d01b7e84951 Author: Tor Lillqvist Date: Tue Apr 15 08:45:29 2014 +0300 WaE: overriding virtual function declaration not marked 'override' Change-Id: Idd8b8fcbaebbedf5d5cd33075ef56829e19dd6c0 diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx index 3fcbba2..2203443 100644 --- a/include/svx/svdoopengl.hxx +++ b/include/svx/svdoopengl.hxx @@ -36,7 +36,7 @@ public: void setRenderer(IOpenGLRenderer* pRenderer); IOpenGLRenderer* getRenderer(); -virtual bool isOpenGLInitialized(); +virtual bool isOpenGLInitialized() SAL_OVERRIDE; private: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source cppuhelper/qa dbaccess/source embeddedobj/source embedserv/source framework/inc include/cppuhelper include/sfx2 linguistic/source svx/source sw/source
comphelper/source/property/genericpropertyset.cxx |2 -
cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx|4 +-
dbaccess/source/core/inc/ContentHelper.hxx|6 +--
dbaccess/source/ui/inc/sbagrid.hxx|9 +
dbaccess/source/ui/inc/sbamultiplex.hxx |2 -
embeddedobj/source/general/intercept.cxx |6 +--
embedserv/source/embed/intercept.cxx |6 +--
framework/inc/dispatch/menudispatcher.hxx |9 +
framework/inc/dispatch/popupmenudispatcher.hxx|9 +
framework/inc/stdtypes.h |8
include/cppuhelper/interfacecontainer.h |2 -
include/sfx2/unoctitm.hxx |9 +
linguistic/source/lngopt.hxx | 20 +---
svx/source/unodraw/shapepropertynotifier.cxx |8 +---
sw/source/core/uibase/inc/unomailmerge.hxx| 16 +
ucb/source/cacher/contentresultsetwrapper.hxx | 11 +-
ucb/source/core/ucbstore.cxx | 18 ---
ucb/source/sorter/sortresult.cxx | 36 +-
ucb/source/ucp/file/bc.cxx|7 +---
ucbhelper/source/provider/contenthelper.cxx |7 +---
ucbhelper/source/provider/resultset.cxx | 19 +--
21 files changed, 37 insertions(+), 177 deletions(-)
New commits:
commit fa0ffdbeb5a12b51c5d9202a5d7709d713a719f1
Author: Stephan Bergmann
Date: Tue Apr 15 07:44:14 2014 +0200
cppu::OMultiTypeInterfaceContainerHelperVar hashImpl param is unused
...since f059134fab0f91b7a15594ad06536a13fbfae034 "INTEGRATION: CWS
cppuhelpshrink: #i72766# save memory in cppuhelper, using a vector instead
of a
hash_map" (but a dummy "void" default is left in place for backwards
compatibility).
Change-Id: I3bb0af8158f34737d41c344464f3cf944e2891ed
diff --git a/comphelper/source/property/genericpropertyset.cxx
b/comphelper/source/property/genericpropertyset.cxx
index 55ce6cd..6badb46 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -58,7 +58,7 @@ namespace comphelper
{
private:
GenericAnyMapImpl maAnyMap;
-::cppu::OMultiTypeInterfaceContainerHelperVar
m_aListener;
+cppu::OMultiTypeInterfaceContainerHelperVar m_aListener;
protected:
virtual void _setPropertyValues( const PropertyMapEntry** ppEntries,
const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException,
IllegalArgumentException, WrappedTargetException ) SAL_OVERRIDE;
diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 3efd35d..838a33a 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -237,8 +237,8 @@ namespace cppu_ifcontainer
void testOMultiTypeInterfaceContainerHelperVar()
{
-typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<
-const char*, rtl::CStringHash, rtl::CStringEqual> StrContainer;
+typedef cppu::OMultiTypeInterfaceContainerHelperVar<
+char const *, void, rtl::CStringEqual> StrContainer;
const char *pTypes[nTests] =
{
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx
b/dbaccess/source/core/inc/ContentHelper.hxx
index bc3f595..0cd416b 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -77,10 +77,8 @@ namespace dbaccess
typedef ::boost::shared_ptr TContentPtr;
-
-typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString,
-OUStringHash
->
PropertyChangeListenerContainer;
+typedef cppu::OMultiTypeInterfaceContainerHelperVar
+PropertyChangeListenerContainer;
typedef ::comphelper::OBaseMutexOContentHelper_MBASE;
typedef ::cppu::WeakComponentImplHelper9<
::com::sun::star::ucb::XContent
,
::com::sun::star::ucb::XCommandProcessor
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index ef9b4db..7d14bb5 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -48,12 +48,6 @@ namespace dbaui
bool operator() (const ::com::sun::star::util::URL& x, const
::com::sun::star::util::URL& y) const {return x.Complete == y.Complete ? true :
false;}
};
-struct SbaURLHash
-{
-sal_Int32 operator() (const ::com::sun::star::util::URL& x) const
{return x.Complete.hashCode();}
-};
-// SbaXGridControl
-
class SbaXStatusMultiplexer;
class SbaXGridControl
:public FmXGridControl
@@ -103,7 +97,8 @@ namespace dbaui
[Libreoffice-commits] core.git: 3 commits - android/Bootstrap external/glew Repository.mk vcl/Module_vcl.mk
Repository.mk |2 +- android/Bootstrap/Makefile.shared |2 +- external/glew/ExternalProject_glew.mk |2 +- vcl/Module_vcl.mk |4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) New commits: commit 71e37567789f20ea5e2cb3997d7d40304b3dd746 Author: Tor Lillqvist Date: Tue Apr 15 08:39:13 2014 +0300 Need libGLESv2 now then Change-Id: I87e91202a6005ad0bec3569b2619a5b191991502 diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index fd86421..54bdfa8 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -90,7 +90,7 @@ WHOLELIBS = \ $(OBJLOCAL)/liblo-native-code.so : native-code.cxx dummies.cxx mkdir -p $(OBJLOCAL) - $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -landroid -ljnigraphics -llog -lz + $(CXX) -Wl,--gc-sections -Wl,--version-script=../../Bootstrap/version.map -Wl,--no-keep-files-mapped -Wl,--no-undefined -DANDROID -DDISABLE_DYNLOADING -shared -o $(OBJLOCAL)/liblo-native-code.so -I$(BUILDDIR)/config_host -I$(SRCDIR)/include native-code.cxx dummies.cxx -L$(INSTDIR)/$(LIBO_LIB_FOLDER) $(WHOLELIBS) $(LIBS) -lgnustl_static -lGLESv2 -landroid -ljnigraphics -llog -lz $(SODEST)/liblo-native-code.so : $(OBJLOCAL)/liblo-native-code.so mkdir -p $(SODEST) commit 3f69f376fc1badb930a91507e619c7aa7c9e7f67 Author: Tor Lillqvist Date: Tue Apr 15 08:38:47 2014 +0300 Stripping confuses the Android NDK tool-chain Change-Id: I0cf84a6ccb783642a3d50a004325a19b79741b32 diff --git a/external/glew/ExternalProject_glew.mk b/external/glew/ExternalProject_glew.mk index 96026a1..97ad954 100644 --- a/external/glew/ExternalProject_glew.mk +++ b/external/glew/ExternalProject_glew.mk @@ -25,7 +25,7 @@ else $(call gb_ExternalProject_get_state_target,glew,build) : $(call gb_ExternalProject_run,glew,\ $(if $(filter TRUE,$(ENABLE_DEBUG)),STRIP=) LD="$(CC)" \ - $(MAKE) glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \ + $(MAKE) STRIP= glew.lib $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter TRUE,$(ENABLE_DEBUG)),debug)) \ ) endif commit 39ad0a912aee360ff285cb3bdcd5cf351dc3eb3b Author: Tor Lillqvist Date: Tue Apr 15 08:37:50 2014 +0300 Build the vclopengl lib for Android, too, i.e. for all our platforms Change-Id: I244eb4877801ceb0ff22e8591dccd6b801d00d68 diff --git a/Repository.mk b/Repository.mk index 7d1da27..e3715d5 100644 --- a/Repository.mk +++ b/Repository.mk @@ -352,7 +352,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ vcl \ vclcanvas \ - $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)),vclopengl) \ + vclopengl \ $(if $(and $(filter unx,$(GUIBASE)),$(filter-out MACOSX,$(OS))), \ vclplug_gen \ $(if $(ENABLE_TDE),vclplug_tde) \ diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index a5b0b32..5f302a8 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -25,9 +25,7 @@ $(eval $(call gb_Module_add_targets,vcl,\ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ Executable_ui-previewer) \ - $(if $(filter FREEBSD IOS LINUX MACOSX WNT,$(OS)), \ - Library_vclopengl \ - ) \ + Library_vclopengl \ )) $(eval $(call gb_Module_add_l10n_targets,vcl,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - solenv/gbuild
solenv/gbuild/platform/IOS_ARM_GCC.mk | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit f95f841bf137037e5064cfc7e776a87388a51a1d Author: Tor Lillqvist Date: Tue Apr 15 07:34:22 2014 +0300 For uniformity with unxgcc.mk, don't bother with -fno-inline when gb_SYMBOLS Change-Id: Ib94b338491a574810280b1bcb6446d02e90a9042 diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index f2541b4..0d53585 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -78,10 +78,10 @@ gb_LinkTarget_OBJCXXFLAGS := $(gb_CXXFLAGS) $(gb_OBJCXXFLAGS) gb_LinkTarget_OBJCFLAGS := $(gb_CFLAGS) $(gb_OBJCFLAGS) ifeq ($(gb_SYMBOL),$(true)) -gb_LinkTarget_CFLAGS += $(gb_DEBUG_CFLAGS) -gb_LinkTarget_CXXFLAGS += $(gb_DEBUG_CFLAGS) -gb_LinkTarget_OBJCXXFLAGS += $(gb_DEBUG_CFLAGS) -gb_LinkTarget_OBJCFLAGS += $(gb_DEBUG_CFLAGS) +gb_LinkTarget_CFLAGS += -g +gb_LinkTarget_CXXFLAGS += -g +gb_LinkTarget_OBJCXXFLAGS += -g +gb_LinkTarget_OBJCFLAGS += -g endif define gb_LinkTarget__get_liblinkflags commit 984047f7cd38b7863ea18bd70e552ee4807ab0b5 Author: Tor Lillqvist Date: Mon Apr 14 23:11:38 2014 +0300 Let's try using -Oz Change-Id: Ib56b50b9ce2252e6eba488e88dd45a5ebd062b6b diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 398fc7a..f2541b4 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -26,7 +26,7 @@ ifeq ($(CXX),) $(error You must set CXX in the environment. See README.cross for example.) endif -gb_COMPILERDEFAULTOPTFLAGS := -Os +gb_COMPILERDEFAULTOPTFLAGS := -Oz include $(GBUILDDIR)/platform/com_GCC_defs.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 9b1108fb4107d1a009acf468a1771214928516c4
Author: Miklos Vajna
Date: Wed Apr 9 10:47:25 2014 +0200
fdo#77229 EMF+ rendering: improve EmfPlusSetClipPath's CombineModeExclude
case
This is still not perfect, but at least we now don't do the opposite of
what was asked.
Change-Id: I5e144c5ec2987902e65b2eb472259d9c39bbbd11
(cherry picked from commit c2af50eb6df396c957890a6b912b8f3185893551)
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index cb0a37b..36e6499 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -115,6 +115,16 @@ const sal_uInt32 EmfPlusLineJoinTypeBevel = 0x0001;
const sal_uInt32 EmfPlusLineJoinTypeRound = 0x0002;
const sal_uInt32 EmfPlusLineJoinTypeMiterClipped = 0x0003;
+enum EmfPlusCombineMode
+{
+EmfPlusCombineModeReplace = 0x,
+EmfPlusCombineModeIntersect = 0x0001,
+EmfPlusCombineModeUnion = 0x0002,
+EmfPlusCombineModeXOR = 0x0003,
+EmfPlusCombineModeExclude = 0x0004,
+EmfPlusCombineModeComplement = 0x0005
+};
+
using namespace ::com::sun::star;
using namespace ::basegfx;
@@ -2185,7 +2195,19 @@ namespace cppcanvas
::basegfx::B2DPolyPolygon& clipPoly
(path.GetPolygon (*this));
clipPoly.transform (rState.mapModeTransform);
-updateClipping (clipPoly, rFactoryParms,
combineMode == 1);
+switch (combineMode)
+{
+case EmfPlusCombineModeReplace:
+case EmfPlusCombineModeIntersect:
+case EmfPlusCombineModeUnion: // Is this,
EmfPlusCombineModeXOR and EmfPlusCombineModeComplement correct?
+case EmfPlusCombineModeXOR:
+case EmfPlusCombineModeComplement:
+updateClipping (clipPoly, rFactoryParms,
combineMode == 1);
+break;
+case EmfPlusCombineModeExclude:
+// Not doing anything is better then including
exactly what we wanted to exclude.
+break;
+}
break;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 11 commits - chart2/source include/svx include/vcl svx/source vcl/Library_vclopengl.mk vcl/source
chart2/source/view/inc/3DChartObjects.hxx|2
chart2/source/view/inc/AbstractShapeFactory.hxx |4
chart2/source/view/inc/GL3DBarChart.hxx |2
chart2/source/view/inc/OpenglShapeFactory.hxx|4
chart2/source/view/inc/ShapeFactory.hxx |4
chart2/source/view/main/ChartView.cxx|4
chart2/source/view/main/DummyXShape.cxx | 10
chart2/source/view/main/DummyXShape.hxx |4
chart2/source/view/main/OpenGLRender.cxx | 155 -
chart2/source/view/main/OpenGLRender.hxx |3
chart2/source/view/main/OpenglShapeFactory.cxx | 86 +--
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx |2
include/svx/svdoopengl.hxx | 18 +
include/svx/unoshape.hxx |6
include/vcl/OpenGLContext.hxx| 167 --
include/vcl/opengl/IOpenGLRenderer.hxx | 47
include/vcl/opengl/OpenGLContext.hxx | 172 +++
include/vcl/opengl/OpenGLHelper.hxx | 27 ++
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |5
svx/source/svdraw/svdoopengl.cxx | 21 +
svx/source/unodraw/unoshap4.cxx | 12 +
vcl/Library_vclopengl.mk |1
vcl/source/opengl/OpenGLContext.cxx |2
vcl/source/opengl/OpenGLHelper.cxx | 145
24 files changed, 547 insertions(+), 356 deletions(-)
New commits:
commit 2be4ee667237a688a863d446d32b74189f796c0b
Author: Markus Mohrhard
Date: Tue Apr 15 01:42:42 2014 +0200
don't try to init OpenGLRender in the constructor
wait until the context has been created and we can actually render
Change-Id: I841d64ae847a2fdc74954887d3a6fcfcd06fc6a3
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 5a0f88e..dc22de2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1143,11 +1143,11 @@ void DummyXShapes::render()
}
DummyChart::DummyChart(uno::Reference< drawing::XShape > xTarget):
-m_GLRender(xTarget)
+m_GLRender(xTarget),
+mbNotInit(true)
{
SAL_INFO("chart2.opengl", "DummyXShape::DummyChart()-test: ");
setName("com.sun.star.chart2.shapes");
-m_GLRender.InitOpenGL();
}
void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition )
@@ -1173,6 +1173,12 @@ void SAL_CALL DummyChart::setSize( const awt::Size&
aSize )
void DummyChart::render()
{
+if(mbNotInit)
+{
+m_GLRender.InitOpenGL();
+mbNotInit = false;
+}
+
SAL_INFO("chart2.opengl", "render chart");
m_GLRender.prepareToRender();
#if 0
diff --git a/chart2/source/view/main/DummyXShape.hxx
b/chart2/source/view/main/DummyXShape.hxx
index b5aeb26..0cff72f 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -407,6 +407,8 @@ private:
public:
OpenGLRender m_GLRender;
+
+bool mbNotInit;
};
class DummyGroup2D : public DummyXShapes
commit 34bd4798c56b5ad84450593f150ce97d912e6a2f
Author: Markus Mohrhard
Date: Tue Apr 15 01:37:45 2014 +0200
remove the glew part in OpenGLRender.cxx
The glew init part is now in vcl"s OpenGLContext class.
Change-Id: I423e45cf7297df87cb8668b43f9243589b7e26ff
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 0ccb353..8ab05b7 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -81,8 +81,6 @@ int static checkGLError(const char *file, int line)
return retCode;
}
-static bool bGlewInit = false;
-
#define CHECK_GL_ERROR() checkGLError(__FILE__, __LINE__)
#define CHECK_GL_FRAME_BUFFER_STATUS() \
@@ -107,19 +105,7 @@ int OpenGLRender::InitOpenGL()
{
//TODO: moggi: get the information from the context
mbArbMultisampleSupported = true;
-if(!bGlewInit)
-{
-glewExperimental = GL_TRUE;
-if (glewInit() != GLEW_OK)
-{
-SAL_WARN("chart2.opengl", "Failed to initialize GLEW");
-return -1;
-}
-else
-bGlewInit = true;
-}
-// These guys don't just check support but setup the vtables.
if (glewIsSupported("framebuffer_object") != GLEW_OK)
{
SAL_WARN("chart2.opengl", "GL stack has no framebuffer support");
commit 6ef014e597571557b6e45edf29c756fac0b9614c
Author: Markus Mohrhard
Date: Tue Apr 15 01:24:32 2014 +0200
initialize the OpenGL context as soon as possible
Change-Id: I58051695d0ca8384fb771bfc74aeb228145f77e6
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
[Libreoffice-commits] core.git: starmath/source
starmath/source/tmpdevice.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 9c7f87831d503cfe773d11db4d7721811a3245ce Author: Thomas Arnhold Date: Tue Apr 15 01:51:08 2014 +0200 missing include gna, pch were enabled... Change-Id: I02e6c5338e6ff65f55df64f3ef67dd2906821959 diff --git a/starmath/source/tmpdevice.cxx b/starmath/source/tmpdevice.cxx index dc2af56..ae4be57 100644 --- a/starmath/source/tmpdevice.cxx +++ b/starmath/source/tmpdevice.cxx @@ -20,6 +20,8 @@ #include "smmod.hxx" #include "tmpdevice.hxx" +#include + // SmTmpDevice // Allows for font and color changes. The original settings will be restored // in the destructor. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-lifetime-fixes' - 3 commits - chart2/source svx/source
chart2/source/view/main/DummyXShape.cxx | 10 --
chart2/source/view/main/DummyXShape.hxx |2 ++
chart2/source/view/main/OpenGLRender.cxx| 14 --
svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx |5 +
4 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 55c6b04344d29cff973a7ece32a8e4ed61f73252
Author: Markus Mohrhard
Date: Tue Apr 15 01:42:42 2014 +0200
don't try to init OpenGLRender in the constructor
wait until the context has been created and we can actually render
Change-Id: I841d64ae847a2fdc74954887d3a6fcfcd06fc6a3
diff --git a/chart2/source/view/main/DummyXShape.cxx
b/chart2/source/view/main/DummyXShape.cxx
index 5a0f88e..dc22de2 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -1143,11 +1143,11 @@ void DummyXShapes::render()
}
DummyChart::DummyChart(uno::Reference< drawing::XShape > xTarget):
-m_GLRender(xTarget)
+m_GLRender(xTarget),
+mbNotInit(true)
{
SAL_INFO("chart2.opengl", "DummyXShape::DummyChart()-test: ");
setName("com.sun.star.chart2.shapes");
-m_GLRender.InitOpenGL();
}
void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition )
@@ -1173,6 +1173,12 @@ void SAL_CALL DummyChart::setSize( const awt::Size&
aSize )
void DummyChart::render()
{
+if(mbNotInit)
+{
+m_GLRender.InitOpenGL();
+mbNotInit = false;
+}
+
SAL_INFO("chart2.opengl", "render chart");
m_GLRender.prepareToRender();
#if 0
diff --git a/chart2/source/view/main/DummyXShape.hxx
b/chart2/source/view/main/DummyXShape.hxx
index b5aeb26..0cff72f 100644
--- a/chart2/source/view/main/DummyXShape.hxx
+++ b/chart2/source/view/main/DummyXShape.hxx
@@ -407,6 +407,8 @@ private:
public:
OpenGLRender m_GLRender;
+
+bool mbNotInit;
};
class DummyGroup2D : public DummyXShapes
commit de2a419821a5b4aa39883ddfea9d6fa08cf7a857
Author: Markus Mohrhard
Date: Tue Apr 15 01:37:45 2014 +0200
remove the glew part in OpenGLRender.cxx
The glew init part is now in vcl"s OpenGLContext class.
Change-Id: I423e45cf7297df87cb8668b43f9243589b7e26ff
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 0ccb353..8ab05b7 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -81,8 +81,6 @@ int static checkGLError(const char *file, int line)
return retCode;
}
-static bool bGlewInit = false;
-
#define CHECK_GL_ERROR() checkGLError(__FILE__, __LINE__)
#define CHECK_GL_FRAME_BUFFER_STATUS() \
@@ -107,19 +105,7 @@ int OpenGLRender::InitOpenGL()
{
//TODO: moggi: get the information from the context
mbArbMultisampleSupported = true;
-if(!bGlewInit)
-{
-glewExperimental = GL_TRUE;
-if (glewInit() != GLEW_OK)
-{
-SAL_WARN("chart2.opengl", "Failed to initialize GLEW");
-return -1;
-}
-else
-bGlewInit = true;
-}
-// These guys don't just check support but setup the vtables.
if (glewIsSupported("framebuffer_object") != GLEW_OK)
{
SAL_WARN("chart2.opengl", "GL stack has no framebuffer support");
commit 97fc07d3039f2b94fb4b31330235916146d99b01
Author: Markus Mohrhard
Date: Tue Apr 15 01:24:32 2014 +0200
initialize the OpenGL context as soon as possible
Change-Id: I58051695d0ca8384fb771bfc74aeb228145f77e6
diff --git a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
index 2cf0086..a4a8d90 100644
--- a/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofopenglobj.cxx
@@ -8,6 +8,9 @@
*/
#include
+#include
+
+#include
#include
#include
@@ -18,6 +21,8 @@ ViewObjectContactOfOpenGLObj::ViewObjectContactOfOpenGLObj(
ObjectContact& rObjectContact, ViewContact& rViewContact )
: ViewObjectContactOfSdrObj( rObjectContact, rViewContact )
{
+OpenGLContext& rContext =
static_cast(static_cast(rViewContact).GetSdrObject()).getOpenGLContext();
+rContext.init(getWindow());
}
ViewObjectContactOfOpenGLObj::~ViewObjectContactOfOpenGLObj()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/node.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 070f337c1e2e8ffbf419a7d952b1a1beaf768fcd Author: Thomas Arnhold Date: Tue Apr 15 01:40:19 2014 +0200 add missing header Change-Id: I004be0486dc4e65d7007a087b68184dcb0e4d165 diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx index d8bde2a..41a74b5 100644 --- a/starmath/source/node.cxx +++ b/starmath/source/node.cxx @@ -28,6 +28,7 @@ #include "tmpdevice.hxx" #include "visitors.hxx" +#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/Library_sm.mk starmath/source
starmath/Library_sm.mk|1
starmath/source/node.cxx | 115 ++
starmath/source/tmpdevice.cxx | 76 +++
starmath/source/tmpdevice.hxx | 48 +
starmath/source/visitors.cxx | 84 ++
5 files changed, 151 insertions(+), 173 deletions(-)
New commits:
commit 88718a876e0d4467eaaccfc3c1873df2b53bf1d3
Author: Thomas Arnhold
Date: Tue Apr 15 01:22:08 2014 +0200
starmath: remove duplicate SmTmpDevice
Change-Id: Ib1733ece03ad0a5ffad5157a622546d0cbac0a35
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 3abafb7..fc1d1e1 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,sm,\
starmath/source/smmod \
starmath/source/symbol \
starmath/source/toolbox \
+starmath/source/tmpdevice \
starmath/source/typemap \
starmath/source/unodoc \
starmath/source/unomodel \
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 24319df..d8bde2a 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -25,98 +25,19 @@
#include "document.hxx"
#include "view.hxx"
#include "mathtype.hxx"
+#include "tmpdevice.hxx"
#include "visitors.hxx"
-#include
-#include
-#include
-#include
-#include
#include
-#include
-#include
+#include
+#include
#include
-#include
#include
#include
-// SmTmpDevice
-// Allows for font and color changes. The original settings will be restored
-// in the destructor.
-// It's main purpose is to allow for the "const" in the 'OutputDevice'
-// argument in the 'Arrange' functions and restore changes made in the 'Draw'
-// functions.
-// Usually a MapMode of 1/100th mm will be used.
-
-
-class SmTmpDevice: private boost::noncopyable
-{
-OutputDevice &rOutDev;
-
-Color Impl_GetColor( const Color& rColor );
-
-public:
-SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm);
-~SmTmpDevice() { rOutDev.Pop(); }
-
-void SetFont(const Font &rNewFont);
-
-operator OutputDevice & () { return rOutDev; }
-};
-
-
-SmTmpDevice::SmTmpDevice(OutputDevice &rTheDev, bool bUseMap100th_mm) :
-rOutDev(rTheDev)
-{
-rOutDev.Push( PUSH_FONT | PUSH_MAPMODE |
- PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_TEXTCOLOR );
-if (bUseMap100th_mm && MAP_100TH_MM != rOutDev.GetMapMode().GetMapUnit())
-{
-SAL_WARN("starmath", "incorrect MapMode?");
-rOutDev.SetMapMode( MAP_100TH_MM ); //Immer fuer 100% fomatieren
-}
-}
-
-
-Color SmTmpDevice::Impl_GetColor( const Color& rColor )
-{
-ColorData nNewCol = rColor.GetColor();
-if (COL_AUTO == nNewCol)
-{
-if (OUTDEV_PRINTER == rOutDev.GetOutDevType())
-nNewCol = COL_BLACK;
-else
-{
-Color aBgCol( rOutDev.GetBackground().GetColor() );
-if (OUTDEV_WINDOW == rOutDev.GetOutDevType())
-aBgCol = ((Window &)
rOutDev).GetDisplayBackground().GetColor();
-
-nNewCol =
SM_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor;
-
-Color aTmpColor( nNewCol );
-if (aBgCol.IsDark() && aTmpColor.IsDark())
-nNewCol = COL_WHITE;
-else if (aBgCol.IsBright() && aTmpColor.IsBright())
-nNewCol = COL_BLACK;
-}
-}
-return Color( nNewCol );
-}
-
-
-void SmTmpDevice::SetFont(const Font &rNewFont)
-{
-rOutDev.SetFont( rNewFont );
-rOutDev.SetTextColor( Impl_GetColor( rNewFont.GetColor() ) );
-}
-
-
-
-
-
SmNode::SmNode(SmNodeType eNodeType, const SmToken &rNodeToken)
: aNodeToken( rNodeToken )
, eType( eNodeType )
@@ -862,7 +783,7 @@ void SmTableNode::Arrange(const OutputDevice &rDev, const
SmFormat &rFormat)
nFormulaBaseline = GetBaseline();
else
{
-SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
+SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
aTmpDev.SetFont(GetFont());
SmRect aRect = (SmRect(aTmpDev, &rFormat, OUString("a"),
@@ -914,7 +835,7 @@ void SmLineNode::Arrange(const OutputDevice &rDev, const
SmFormat &rFormat)
if (NULL != (pNode = GetSubNode(i)))
pNode->Arrange(rDev, rFormat);
-SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
+SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
aTmpDev.SetFont(GetFont());
if (nSize < 1)
@@ -1485,7 +1406,7 @@ void SmBinDiagonalNode::Arrange(const OutputDevice &rDev,
const SmFormat &rForma
//! some routines being called extract some info from the OutputDevice's
//! font (eg the space to be used for borders OR the font name(!!)).
//! Thus the font should reflect the needs and has to be set!
-SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
+SmTmpDevice aTmpDev ((OutputDevice &) rDev, true);
aTmpDev.SetFont(
[Libreoffice-commits] core.git: Changes to 'private/tbsdy/seperateoutdev'
New branch 'private/tbsdy/seperateoutdev' available with the following commits: commit 30e12771f741049227173f3b1c05cfe221a54df0 Author: Chris Sherlock Date: Tue Apr 15 01:06:48 2014 +1000 Split outdev5.cxx and outdev6.cxx outdev5.cxx deals with curved shapes, so renamed to curvedshapes.cxx Moved polygon functions to polygon.cxx, transparency functions to transparent.cxx, a few miscellaneous functions to outdev.cxx and as the rest of the functions are wallpaper functions then renamed outdev6.cxx to wallpaper.cxx Change-Id: I62a0b66d4d66740fb5f70ecb558db1ad3bf76eb5 commit e77165bfff96e50295602eca80509684d11b973a Author: Chris Sherlock Date: Tue Apr 15 00:13:51 2014 +1000 Split outdev3.cxx Split outdev3.cxx into font and text functions Change-Id: I535dbbce055246865d4d5b62fb1ea5b991fb4663 commit 28919f5f9fb779cd8a2ec53e6c445391a5fb39ef Author: Chris Sherlock Date: Mon Apr 14 23:20:53 2014 +1000 Split outdev2.cxx I have split outdev2.cxx into the following files: + alpha.cxx + bezier.cxx + bitmap.cxx + blend.cxx + gradient.cxx + hatch.cxx + pixel.cxx + polygon.cxx + line.cxx + polyline.cxx + rect.cxx + transparent.cxx I have also moved all the DrawDev functions into outdev.cxx Change-Id: Ica7057250526cd1ed680e5ec173c73265a586ea3 commit e0a8a7f60982979a891542cd3ee48a37c9bc1ab6 Author: Chris Sherlock Date: Mon Apr 14 21:54:43 2014 +1000 Move lines and rectangles to seperate source files Change-Id: I03ef9d09fed831c6d595924f1c681718a89106b2 commit aa0606c184af1fcb8e529929513466f16a47e52d Author: Chris Sherlock Date: Mon Apr 14 21:26:10 2014 +1000 Move line functions into line.cxx and polyline.cxx Reorganized line functions by moving them into seperate line.cxx and polyline.cxx source files. Change-Id: Ifee39cb7f88ed04be2cf7aeb4b46870c404f6eeb commit cecb13aec254ed6da4badad44a40d5dec4af6e7d Author: Chris Sherlock Date: Mon Apr 14 20:38:23 2014 +1000 Remove unnecessary headers from polygon.cxx Change-Id: Ie37e18d5e2d17840ebc0cb55362923ac14371a3d commit a1f824ce9fba2b076ca51a7cb248ceae32301ca7 Author: Chris Sherlock Date: Mon Apr 14 20:29:32 2014 +1000 Remove unnecessary includes from hatch.cxx Change-Id: Iaaa28a4e1150d0cdabf4989b0e76a0bf37c14293 commit 8490d1e81ba3a8cb89e1b513ea18427ea8d9abf1 Author: Chris Sherlock Date: Mon Apr 14 20:19:44 2014 +1000 Remove unnecessary includes from gradient.cxx Change-Id: If85cc6598d67454ca7555d64cac894e84cdb1b01 commit 70d94d03b7a0b40299c3f97cf4079d1f81dcc8f7 Author: Chris Sherlock Date: Mon Apr 14 20:10:29 2014 +1000 Move bezier functions into own source file bezier.cxx Change-Id: I2071b3b1f3bb865075205cb4a90d2e230a8a5ca8 commit 0cbbf1c0cd85102ad6c5f8255f6fe1ba47ba29cd Author: Chris Sherlock Date: Mon Apr 14 19:39:43 2014 +1000 Don't forget to add polygon as an object in the makefile! Change-Id: Ib4a51d23d80d20e00968929628bbb4966b78c408 commit e8494ba73f4616e74f81417e4fce8f8568b9c564 Author: Chris Sherlock Date: Mon Apr 14 18:29:19 2014 +1000 Rename ImplGetGradientColorValue ImplGetGradientColorValue renamed to GetGradientColorValue. Also made it part of the anonymous namespace as it's only used by gradient.cxx Change-Id: I15079b4cef60aa91ecb76ff854e1ddac7d88f31d commit da43e682b78afde3f227b94d4061a07945309932 Author: Chris Sherlock Date: Mon Apr 14 18:22:39 2014 +1000 Change acessibility level for private functions The following functions should be private members functions of OutputDevice: * DrawComplexGradient * DrawLinearGradient These were previously called ImplDrawComplexGradient and ImplDrawLinearGradient. Change-Id: I4fc996ddd578bca6738128fcc883709359534c95 commit bea717ceedec8c4924a01c80dcaa6f47af7433df Author: Chris Sherlock Date: Mon Apr 14 18:17:50 2014 +1000 Reorganize locations of functions in gradient.cxx Change-Id: Ibce763ab4397c4ca4ebce0b25322c249f36499e2 commit cfb48b1eaccd7f3ce855737f632bc50f8261a3ed Author: Chris Sherlock Date: Mon Apr 14 18:07:00 2014 +1000 Move hatch functions to own source file. Move outdev4.cxx to hatch.cxx as this now only contains hatch functions. Change-Id: I76fb3c6513045881cd04601e80e3f9a31c2f1f9c commit a594c3b0fe618dc0c77b30dcc658a8ccc79a86d9 Author: Chris Sherlock Date: Sun Apr 13 12:43:54 2014 +1000 Fix typo Change-Id: Iab3ce70bd255aae4e240a76c627a189553ad5937 commit 4095b9352d09b4065c365b3e5fe6b74d68c8 Author: Chris Sherlock Date: Sun Apr 13 12:35:59 2014 +1000 Move OutputDevice polygon funcs to vcl/source/gdi/outdev/polygon.cxx Change-Id: I3bff53898ab8cb912d38f343b3521ca3d51471f6 commit 45400f5472071aefe8d114e8561a6d4f97a827e1 Author: Chris Sherlock Date: Sun
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-lifetime-fixes' - 2 commits - chart2/source include/svx include/vcl svx/source vcl/Library_vclopengl.mk vcl/source
chart2/source/view/inc/3DBarChart.hxx|2
chart2/source/view/inc/3DChartObjects.hxx|2
chart2/source/view/main/DummyXShape.hxx |2
chart2/source/view/main/OpenGLRender.cxx | 141
chart2/source/view/main/OpenGLRender.hxx |3
chart2/source/view/main/OpenglShapeFactory.cxx |2
include/svx/sdr/contact/viewobjectcontactofopenglobj.hxx |2
include/svx/svdoopengl.hxx |4
include/vcl/IOpenGLRenderer.hxx | 47
include/vcl/OpenGLContext.hxx| 172 ---
include/vcl/opengl/IOpenGLRenderer.hxx | 47
include/vcl/opengl/OpenGLContext.hxx | 172 +++
include/vcl/opengl/OpenGLHelper.hxx | 27 ++
svx/source/svdraw/svdoopengl.cxx |2
vcl/Library_vclopengl.mk |1
vcl/source/opengl/OpenGLContext.cxx |2
vcl/source/opengl/OpenGLHelper.cxx | 145
17 files changed, 408 insertions(+), 365 deletions(-)
New commits:
commit 9028f22b61613e6deef3f015e6c8910827047c4a
Author: Markus Mohrhard
Date: Tue Apr 15 00:55:07 2014 +0200
move some common OpenGL methods to vcl
Change-Id: Ic96487afce64bfb0c1dfcc03c088e5d6e1b34ad3
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 01331a0..0ccb353 100755
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -35,9 +35,7 @@
#include
#include
-#include
-#include
-#include
+#include
#include
@@ -96,133 +94,6 @@ static bool bGlewInit = false;
namespace {
-OUString getShaderFolder()
-{
-OUString aUrl("$BRAND_BASE_DIR/" LIBO_ETC_FOLDER);
-rtl::Bootstrap::expandMacros(aUrl);
-
-return aUrl + "/opengl/";
-}
-
-OUString maShaderFolder = getShaderFolder();
-
-OString loadShader(const OUString& rFilename)
-{
-OUString aFileURL = maShaderFolder + rFilename +".glsl";
-osl::File aFile(aFileURL);
-if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
-{
-sal_uInt64 nSize = 0;
-aFile.getSize(nSize);
-char* content = new char[nSize+1];
-sal_uInt64 nBytesRead = 0;
-aFile.read(content, nSize, nBytesRead);
-if(nSize != nBytesRead)
-assert(false);
-
-content[nSize] = 0;
-return OString(content);
-}
-else
-{
-SAL_WARN("chart2.opengl", "could not load the file: " << aFileURL);
-}
-
-return OString();
-}
-
-}
-
-GLint OpenGLRender::LoadShaders(const OUString& rVertexShaderName,const
OUString& rFragmentShaderName)
-{
-// Create the shaders
-GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
-GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-
-GLint Result = GL_FALSE;
-int InfoLogLength;
-
-// Compile Vertex Shader
-OString aVertexShaderSource = loadShader(rVertexShaderName);
-char const * VertexSourcePointer = aVertexShaderSource.getStr();
-glShaderSource(VertexShaderID, 1, &VertexSourcePointer , NULL);
-glCompileShader(VertexShaderID);
-
-// Check Vertex Shader
-glGetShaderiv(VertexShaderID, GL_COMPILE_STATUS, &Result);
-if ( !Result )
-{
-glGetShaderiv(VertexShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-if ( InfoLogLength > 0 )
-{
-std::vector VertexShaderErrorMessage(InfoLogLength+1);
-glGetShaderInfoLog(VertexShaderID, InfoLogLength, NULL,
&VertexShaderErrorMessage[0]);
-VertexShaderErrorMessage.push_back('\0');
-SAL_WARN("chart2.opengl", "vertex shader compile failed : " <<
&VertexShaderErrorMessage[0]);
-}
-else
-SAL_WARN("chart2.opengl", "vertex shader compile failed without
error log");
-
-return 0;
-}
-
-// Compile Fragment Shader
-OString aFragmentShaderSource = loadShader(rFragmentShaderName);
-char const * FragmentSourcePointer = aFragmentShaderSource.getStr();
-glShaderSource(FragmentShaderID, 1, &FragmentSourcePointer , NULL);
-glCompileShader(FragmentShaderID);
-
-// Check Fragment Shader
-glGetShaderiv(FragmentShaderID, GL_COMPILE_STATUS, &Result);
-if ( !Result )
-{
-glGetShaderiv(FragmentShaderID, GL_INFO_LOG_LENGTH, &InfoLogLength);
-if ( InfoLogLength > 0 )
-{
-std::vector FragmentShaderErrorMessage(InfoLogLength+1);
-glGetShaderInfoLog(FragmentShaderID, InfoLogLength, NULL,
&FragmentShaderErrorMessage[0]);
-FragmentShaderErrorMessage.push_back('\0');
-SAL_WARN("chart2.opengl", "fragment shader compile failed : " <<
&FragmentShaderErrorMessage[0]);
-}
-else
-SAL_W
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/ui/dlg/Formula.cxx |6 --
reportdesign/source/ui/inc/Formula.hxx | 11 ++-
reportdesign/source/ui/misc/UITools.cxx | 11 ++-
3 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 6bb7fa8df523d3ae7b9945009fb1034f28cb0a0a
Author: Kohei Yoshida
Date: Mon Apr 14 18:56:12 2014 -0400
fdo#76294: Fix the build.
Change-Id: I123751e9f08faaccc06649c2f8b29a9a33548312
diff --git a/reportdesign/source/ui/dlg/Formula.cxx
b/reportdesign/source/ui/dlg/Formula.cxx
index 75ddb03..5fe7375 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -46,7 +46,8 @@ FormulaDialog::FormulaDialog(Window* pParent
, const
uno::Reference& _xServiceFactory
, const ::boost::shared_ptr< IFunctionManager >&
_pFunctionMgr
, const OUString& _sFormula
- , const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& _xRowSet)
+ , const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& _xRowSet
+ , svl::SharedStringPool& rStrPool )
: FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this)
,m_aFunctionManager(_pFunctionMgr)
,m_pFormulaData(new FormEditData())
@@ -56,6 +57,7 @@ FormulaDialog::FormulaDialog(Window* pParent
,m_sFormula("=")
,m_nStart(0)
,m_nEnd(1)
+,mrStringPool(rStrPool)
{
if ( !_sFormula.isEmpty() )
{
@@ -255,7 +257,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr
FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >&
_aTokenList)
{
::std::auto_ptr pArray(new
FormulaTokenArray());
-pArray->Fill(_aTokenList, NULL);
+pArray->Fill(_aTokenList, mrStringPool, NULL);
return pArray;
}
diff --git a/reportdesign/source/ui/inc/Formula.hxx
b/reportdesign/source/ui/inc/Formula.hxx
index 030e438..d3b2f10 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -30,6 +30,11 @@ namespace com { namespace sun { namespace star { namespace
lang {
class XMultiServiceFactory;
} } } }
+namespace svl {
+
+class SharedStringPool;
+
+}
namespace rptui
{
@@ -51,13 +56,17 @@ class FormulaDialog : public formula::FormulaModalDialog,
sal_Int32 m_nStart;
sal_Int32 m_nEnd;
+svl::SharedStringPool& mrStringPool;
+
DECL_LINK( OnClickHdl, OAddFieldWindow*);
public:
FormulaDialog( Window* pParent
, const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory
, const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
, const OUString& _sFormula
-, const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& _xRowSet);
+, const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& _xRowSet
+, svl::SharedStringPool& rStrPool );
+
virtual ~FormulaDialog();
// IFormulaEditorHelper
diff --git a/reportdesign/source/ui/misc/UITools.cxx
b/reportdesign/source/ui/misc/UITools.cxx
index f85721f..7533d84 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -77,9 +77,11 @@
#include
#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -1029,7 +1031,14 @@ bool openDialogFormula_nothrow( OUString&
_in_out_rFormula
{
::boost::shared_ptr< formula::IFunctionManager >
pFormulaManager(new FunctionManager(xMgr) );
ReportFormula aFormula( _in_out_rFormula );
-FormulaDialog
aDlg(pParent,xServiceFactory,pFormulaManager,aFormula.getUndecoratedContent(),_xRowSet);
+
+LanguageTag aLangTag(LANGUAGE_SYSTEM);
+CharClass aCC(_xContext, aLangTag);
+svl::SharedStringPool aStringPool(&aCC);
+
+FormulaDialog aDlg(
+pParent, xServiceFactory, pFormulaManager,
aFormula.getUndecoratedContent(), _xRowSet, aStringPool);
+
bSuccess = aDlg.Execute() == RET_OK;
if ( bSuccess )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source
cui/source/options/optgdlg.cxx | 43 +
1 file changed, 39 insertions(+), 4 deletions(-)
New commits:
commit 042d4f8300a9a97fdd8da89013288a2c5623d48e
Author: Eike Rathke
Date: Mon Apr 14 23:52:02 2014 +0200
a pattern must not start with a separator
Change-Id: I5dfc5c859b007b7e3d7266c7656dc53378ba
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 3e8718b..08586e8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1736,6 +1736,10 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*,
pEd )
bSep = false;
break;
default:
+// A pattern must not start with a separator (but
+// may end with).
+if (!(bY || bM || bD))
+bValid = false;
bSep = true;
}
nChar += i-j;
commit 03e96dd2bea1dba5297a41b5ed1ee3b4d0c3b65b
Author: Eike Rathke
Date: Mon Apr 14 23:19:18 2014 +0200
toupper YMD for better input check visibility
Change-Id: I24a01860bd019c3bf6e36c1e9df16e6ae6aa0ace
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f833d44..3e8718b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1668,13 +1668,16 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl,
SvxLanguageBox*, pBox )
IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*, pEd )
{
-OUString aPatterns( pEd->GetText());
+const OUString aPatterns( pEd->GetText());
+OUStringBuffer aBuf( aPatterns);
+sal_Int32 nChar = 0;
bool bValid = true;
+bool bModified = false;
if (!aPatterns.isEmpty())
{
-for (sal_Int32 nIndex=0; nIndex >= 0 && bValid; /*nop*/)
+for (sal_Int32 nIndex=0; nIndex >= 0 && bValid; ++nChar)
{
-OUString aPat( aPatterns.getToken( 0, ';', nIndex));
+const OUString aPat( aPatterns.getToken( 0, ';', nIndex));
if (aPat.isEmpty() && nIndex < 0)
{
// Indicating failure when about to append a pattern is too
@@ -1691,37 +1694,65 @@ IMPL_LINK( OfaLanguagesTabPage, DatePatternsHdl, Edit*,
pEd )
bool bSep = true;
for (sal_Int32 i = 0; i < aPat.getLength() && bValid; /*nop*/)
{
-sal_uInt32 c = aPat.iterateCodePoints( &i);
+const sal_Int32 j = i;
+const sal_uInt32 c = aPat.iterateCodePoints( &i);
// Only one Y,M,D per pattern, separated by any
character(s).
switch (c)
{
+case 'y':
case 'Y':
if (bY || !bSep)
bValid = false;
+else if (c == 'y')
+{
+aBuf[nChar] = 'Y';
+bModified = true;
+}
bY = true;
bSep = false;
break;
+case 'm':
case 'M':
if (bM || !bSep)
bValid = false;
+else if (c == 'm')
+{
+aBuf[nChar] = 'M';
+bModified = true;
+}
bM = true;
bSep = false;
break;
+case 'd':
case 'D':
if (bD || !bSep)
bValid = false;
+else if (c == 'd')
+{
+aBuf[nChar] = 'D';
+bModified = true;
+}
bD = true;
bSep = false;
break;
default:
bSep = true;
}
+nChar += i-j;
}
// At least one of Y,M,D
bValid &= (bY || bM || bD);
}
}
}
+if (bModified)
+{
+// Do not use SetText(...,GetSelection()) because internally the
+// reference's pointer of the selection is obtained resulting in the
+// entire text being selected at the end.
+Selection aSelection( pEd->GetSelection());
+pEd->SetText( aBuf.makeStringAndClear(), aSelection);
+}
if (bValid)
{
pEd
[Libreoffice-commits] core.git: formula/source include/formula sc/inc sc/source
formula/source/core/api/token.cxx | 25 +++--
include/formula/tokenarray.hxx|9 +++--
sc/inc/tokenarray.hxx |5 -
sc/source/core/tool/token.cxx | 27 ++-
sc/source/ui/formdlg/formula.cxx |2 +-
sc/source/ui/unoobj/tokenuno.cxx |2 +-
6 files changed, 42 insertions(+), 28 deletions(-)
New commits:
commit 625c595fc30d2e6153735dc2ed2359ff4f8a1e3a
Author: Kohei Yoshida
Date: Mon Apr 14 18:32:57 2014 -0400
fdo#76294: Intern strings in AddFormulaToken() as well.
And a whole bunch of changes needed to make that happen.
Change-Id: Idd98fbc99322c0d72fb0a7848d89cb1a6abc88b6
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index ecfb02a..197d62f 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -29,6 +29,7 @@
#include "formula/tokenarray.hxx"
#include "formula/FormulaCompiler.hxx"
#include
+#include
namespace formula
{
@@ -297,12 +298,13 @@ FormulaJumpToken::~FormulaJumpToken()
}
-bool FormulaTokenArray::AddFormulaToken(const sheet::FormulaToken&
_aToken,ExternalReferenceHelper* /*_pRef*/)
+bool FormulaTokenArray::AddFormulaToken(
+const sheet::FormulaToken& rToken, svl::SharedStringPool& rSPool,
ExternalReferenceHelper* /*pExtRef*/)
{
bool bError = false;
-const OpCode eOpCode = static_cast(_aToken.OpCode); //!
assuming equal values for the moment
+const OpCode eOpCode = static_cast(rToken.OpCode); //!
assuming equal values for the moment
-const uno::TypeClass eClass = _aToken.Data.getValueTypeClass();
+const uno::TypeClass eClass = rToken.Data.getValueTypeClass();
switch ( eClass )
{
case uno::TypeClass_VOID:
@@ -312,14 +314,14 @@ bool FormulaTokenArray::AddFormulaToken(const
sheet::FormulaToken& _aToken,Exter
case uno::TypeClass_DOUBLE:
// double is only used for "push"
if ( eOpCode == ocPush )
-AddDouble( _aToken.Data.get() );
+AddDouble( rToken.Data.get() );
else
bError = true;
break;
case uno::TypeClass_LONG:
{
// long is svIndex, used for name / database area, or "byte"
for spaces
-sal_Int32 nValue = _aToken.Data.get();
+sal_Int32 nValue = rToken.Data.get();
if ( eOpCode == ocDBArea )
AddToken( formula::FormulaIndexToken( eOpCode,
static_cast(nValue) ) );
else if ( eOpCode == ocSpaces )
@@ -330,9 +332,9 @@ bool FormulaTokenArray::AddFormulaToken(const
sheet::FormulaToken& _aToken,Exter
break;
case uno::TypeClass_STRING:
{
-OUString aStrVal( _aToken.Data.get() );
+OUString aStrVal( rToken.Data.get() );
if ( eOpCode == ocPush )
-AddString( aStrVal );
+AddString(rSPool.intern(aStrVal));
else if ( eOpCode == ocBad )
AddBad( aStrVal );
else if ( eOpCode == ocStringXML )
@@ -348,13 +350,16 @@ bool FormulaTokenArray::AddFormulaToken(const
sheet::FormulaToken& _aToken,Exter
} // switch ( eClass )
return bError;
}
-bool FormulaTokenArray::Fill(const uno::Sequence< sheet::FormulaToken >&
_aSequence,ExternalReferenceHelper* _pRef)
+
+bool FormulaTokenArray::Fill(
+const uno::Sequence& rSequence,
+svl::SharedStringPool& rSPool, ExternalReferenceHelper* pExtRef )
{
bool bError = false;
-const sal_Int32 nCount = _aSequence.getLength();
+const sal_Int32 nCount = rSequence.getLength();
for (sal_Int32 nPos=0; nPos& _aSequence, ExternalReferenceHelper*
_pRef = NULL);
+bool Fill(
+const css::uno::Sequence& rSequence,
+svl::SharedStringPool& rSPool, ExternalReferenceHelper* pExtRef );
/**
* Do some checking based on the individual tokens. For now, we use this
diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index a1fae5b..1ea6658 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -83,7 +83,10 @@ public:
const ScAddress& rPos, ScDirection );
formula::FormulaToken* AddRawToken( const ScRawToken& );
-virtual bool AddFormulaToken(const com::sun::star::sheet::FormulaToken&
_aToken,formula::ExternalReferenceHelper* _pRef) SAL_OVERRIDE;
+virtual bool AddFormulaToken(
+const css::sheet::FormulaToken& rToken,
+svl::SharedStringPool& rSPool,
+formula::ExternalReferenceHelper* _pRef) SAL_OVERRIDE;
virtual void CheckToken( const formula::FormulaToken& r ) SAL_OVERRIDE;
virtual formula::FormulaToken* AddOpCode( OpCode eCode ) SAL_OVERRIDE;
/** ScSingleRefToken with ocPush. */
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 7af3123..58f64cc 100644
-
[Libreoffice-commits] core.git: Branch 'private/moggi/chart-lifetime-fixes' - 2 commits - chart2/source include/svx include/vcl svx/source
chart2/source/view/inc/AbstractShapeFactory.hxx |4 +-
chart2/source/view/inc/OpenglShapeFactory.hxx |4 +-
chart2/source/view/inc/ShapeFactory.hxx |4 +-
chart2/source/view/main/ChartView.cxx |4 +-
chart2/source/view/main/OpenglShapeFactory.cxx | 48 ++--
include/svx/svdoopengl.hxx |4 +-
include/vcl/IOpenGLRenderer.hxx | 28 +-
include/vcl/OpenGLContext.hxx |5 ++
svx/source/svdraw/svdoopengl.cxx|6 +++
9 files changed, 85 insertions(+), 22 deletions(-)
New commits:
commit e1192ce1617f81706c6e20bc57e8ffbed00e896e
Author: Markus Mohrhard
Date: Tue Apr 15 00:27:25 2014 +0200
only render through OpenGL after successful context creation
Change-Id: I60ebceee2bf0eca1c7022e14fc43128347d682b5
diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx
b/chart2/source/view/inc/AbstractShapeFactory.hxx
index 525220a..833380c 100644
--- a/chart2/source/view/inc/AbstractShapeFactory.hxx
+++ b/chart2/source/view/inc/AbstractShapeFactory.hxx
@@ -239,9 +239,9 @@ public:
/**
* Only necessary for stateless implementations
*/
-virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) = 0;
+virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > xDrawPage) = 0;
-virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) = 0;
+virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > xDrawPage) = 0;
static ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >
getChartRootShape( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx
b/chart2/source/view/inc/OpenglShapeFactory.hxx
index e9b2614..c93199f 100644
--- a/chart2/source/view/inc/OpenglShapeFactory.hxx
+++ b/chart2/source/view/inc/OpenglShapeFactory.hxx
@@ -184,9 +184,9 @@ public:
virtual void setPageSize( com::sun::star::uno::Reference <
com::sun::star::drawing::XShapes > xChartShapes, const
com::sun::star::awt::Size& rSize ) SAL_OVERRIDE;
-virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE;
+virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > xDrawPage) SAL_OVERRIDE;
-virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE;
+virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > xDrawPage) SAL_OVERRIDE;
};
}
diff --git a/chart2/source/view/inc/ShapeFactory.hxx
b/chart2/source/view/inc/ShapeFactory.hxx
index 74a4d38..87a4387 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -197,9 +197,9 @@ public:
/**
* not necessary right now
*/
-virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {}
+virtual void render(com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > ) SAL_OVERRIDE {}
-virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XShapes > ) SAL_OVERRIDE {}
+virtual void clearPage(com::sun::star::uno::Reference<
com::sun::star::drawing::XDrawPage > ) SAL_OVERRIDE {}
private:
ShapeFactory();
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index cd60243..37f3481 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2476,7 +2476,7 @@ void ChartView::createShapes()
OSL_FAIL("could not set page size correctly");
}
pShapeFactory->setPageSize(mxRootShape, aPageSize);
-pShapeFactory->clearPage(mxRootShape);
+pShapeFactory->clearPage(m_xDrawPage);
if(isReal3DChart())
{
@@ -2629,7 +2629,7 @@ void ChartView::createShapes()
//cleanup: remove all empty group shapes to avoid grey border lines:
lcl_removeEmptyGroupShapes( mxRootShape );
-pShapeFactory->render( mxRootShape );
+pShapeFactory->render( m_xDrawPage );
if(maTimeBased.bTimeBased && maTimeBased.nFrame % 60 == 0)
{
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx
b/chart2/source/view/main/OpenglShapeFactory.cxx
index 75992c0..34c2ea6 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -71,7 +71,6 @@ public:
mxShapes(xShapes) {}
virtual ~OpenGLChartAdapter() {}
-virtual void operator()() {}
uno::Reference getShapes()
{
@@ -483,15 +482,34 @@ uno::Reference< drawing::XShape >
return pText;
}
-void OpenglShapeFactory::render(uno::Reference< drawing::XShapes > xRootShape)
+void
[Libreoffice-commits] core.git: 2 commits - formula/source include/formula sc/qa sc/source
formula/source/core/api/token.cxx|7 --
include/formula/tokenarray.hxx |8 ++-
sc/qa/unit/data/xls/shared-string/literal-in-formula.xls |binary
sc/qa/unit/subsequent_filters-test.cxx | 16 +++
sc/source/core/data/conditio.cxx | 13 +---
sc/source/core/data/validat.cxx |6 +++--
sc/source/core/tool/formulagroup.cxx |5 +++-
sc/source/filter/excel/excform.cxx |4 +--
sc/source/filter/excel/excform8.cxx |2 -
sc/source/filter/excel/frmbase.cxx | 11 +-
sc/source/filter/excel/tokstack.cxx | 11 ++
sc/source/filter/excel/xicontent.cxx |2 -
sc/source/filter/excel/xlformula.cxx |6 +++--
sc/source/filter/inc/XclImpChangeTrack.hxx | 12 ---
sc/source/filter/inc/excform.hxx |4 +--
sc/source/filter/inc/formel.hxx | 12 ---
sc/source/filter/inc/lotform.hxx |3 +-
sc/source/filter/inc/qproform.hxx|6 ++---
sc/source/filter/inc/tokstack.hxx| 14 ++---
sc/source/filter/inc/xlformula.hxx |9 +++-
sc/source/filter/lotus/lotform.cxx |4 +--
sc/source/filter/lotus/lotimpop.cxx |2 -
sc/source/filter/lotus/op.cxx|6 +++--
sc/source/filter/oox/condformatbuffer.cxx|4 ++-
sc/source/filter/qpro/qpro.cxx | 11 ++
sc/source/filter/qpro/qproform.cxx |4 +--
sc/source/filter/xcl97/XclImpChangeTrack.cxx |5
sc/source/ui/unoobj/funcuno.cxx |4 ++-
28 files changed, 130 insertions(+), 61 deletions(-)
New commits:
commit b09426b83c12b0cd27cd909602251cb076ffa4ba
Author: Kohei Yoshida
Date: Mon Apr 14 16:57:52 2014 -0400
fdo#76294: Properly intern string literals in formula on xls import.
Change-Id: Ib3a442cbb68c23294762561f2911101a087a795e
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index da98d0e..ecfb02a 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -801,7 +801,7 @@ FormulaToken* FormulaTokenArray::Add( FormulaToken* t )
}
}
-FormulaToken* FormulaTokenArray::AddString( const OUString& rStr )
+FormulaToken* FormulaTokenArray::AddString( const svl::SharedString& rStr )
{
return Add( new FormulaStringToken( rStr ) );
}
@@ -1369,7 +1369,10 @@ bool FormulaDoubleToken::operator==( const FormulaToken&
r ) const
}
FormulaStringToken::FormulaStringToken( const svl::SharedString& r ) :
-FormulaToken( svString ), maString( r ) {}
+FormulaToken( svString ), maString( r )
+{
+}
+
FormulaStringToken::FormulaStringToken( const FormulaStringToken& r ) :
FormulaToken( r ), maString( r.maString ) {}
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 7370e43..fba33e8 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -27,6 +27,12 @@
#include
+namespace svl {
+
+class SharedString;
+
+}
+
namespace formula
{
@@ -212,7 +218,7 @@ public:
virtual void CheckToken( const FormulaToken& t );
FormulaToken* AddToken( const FormulaToken& );
-FormulaToken* AddString( const OUString& rStr );
+FormulaToken* AddString( const svl::SharedString& rStr );
FormulaToken* AddDouble( double fVal );
FormulaToken* AddExternal( const sal_Unicode* pStr );
/** Xcl import may play dirty tricks with OpCode!=ocExternal.
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 7bb2f45..8ad386a 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -40,7 +40,8 @@
#include "editutil.hxx"
#include "tokenarray.hxx"
#include "refupdatecontext.hxx"
-#include "svl/sharedstring.hxx"
+#include
+#include
using namespace formula;
@@ -1306,7 +1307,10 @@ ScTokenArray* ScConditionEntry::CreateTokenArry(
sal_uInt16 nIndex ) const
{
pRet = new ScTokenArray();
if (bIsStr1)
-pRet->AddString( aStrVal1 );
+{
+svl::SharedStringPool& rSPool = mpDoc->GetSharedStringPool();
+pRet->AddString(rSPool.intern(aStrVal1));
+}
else
pRet->AddDouble( nVal1 );
}
@@ -1319,7 +1323,10 @@ ScTokenArray* ScConditionEntry::CreateTokenArry(
sal_uInt16 nIndex ) const
{
pRet = new ScTokenArray();
if (bIsStr2)
-pRet->AddString( aStrVal2 );
+{
+
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/spellcheck/macosxspell/macreg.mm | 15 +--
lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx |3 ++
2 files changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 981590d1cf89bb07864ec62bfebdc03c61bd475b
Author: Stephan Bergmann
Date: Mon Apr 14 21:54:23 2014 +0200
Clean up function declarations
Change-Id: Ic00323f1c22f9b3642758dc21b65a2413624515e
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.mm
b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
index 6324c32..b3504c1 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.mm
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.mm
@@ -24,22 +24,11 @@
#include
+#include
+
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
-
-// declaration of external RegEntry-functions defined by the service objects
-
-
-extern void * SAL_CALL MacSpellChecker_getFactory(
-const sal_Char * pImplName,
-XMultiServiceFactory * pServiceManager,
-void * /*pRegistryKey*/ );
-
-
-// definition of the two functions that are used to provide the services
-
-
extern "C"
{
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
index 696553d..94a53a9 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.hxx
@@ -127,6 +127,9 @@ inline OUString
MacSpellChecker::getImplementationName_Static() throw()
return OUString( "org.openoffice.lingu.MacOSXSpellChecker" );
}
+void * SAL_CALL MacSpellChecker_getFactory(
+char const * pImplName, XMultiServiceFactory * pServiceManager, void *);
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svgio/source
svgio/source/svguno/xsvgparser.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 6a682c41e5013b227a254a3ba7a2954a4fbb793a
Author: Stephan Bergmann
Date: Mon Apr 14 21:38:46 2014 +0200
Clean up function declarations
Change-Id: Id628629bdab2aa9446d449bc091a7bb82dab54eb
diff --git a/svgio/source/svguno/xsvgparser.cxx
b/svgio/source/svguno/xsvgparser.cxx
index 4f77167..2032ce8 100644
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@@ -19,6 +19,7 @@
#include "sal/config.h"
+#include
#include
#include
#include
@@ -38,12 +39,9 @@ namespace svgio
{
namespace svgreader
{
-class XSvgParser : public ::cppu::WeakAggImplHelper2<
graphic::XSvgParser, lang::XServiceInfo >
+class XSvgParser : public ::cppu::WeakAggImplHelper2<
graphic::XSvgParser, lang::XServiceInfo >, private boost::noncopyable
{
private:
-XSvgParser(const XSvgParser&);
-XSvgParser& operator=(const XSvgParser&);
-
uno::Reference< uno::XComponentContext > context_;
protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlexport.cxx |1
starmath/source/mathmlimport.cxx |6 --
starmath/source/node.cxx | 11
starmath/source/register.cxx | 67
starmath/source/register.hxx | 92 +++
starmath/source/unodoc.cxx |1
starmath/source/visitors.cxx | 10
7 files changed, 100 insertions(+), 88 deletions(-)
New commits:
commit 6880e9c97377940a4b967a68f4f936486b58face
Author: Stephan Bergmann
Date: Mon Apr 14 21:37:24 2014 +0200
Clean up function declarations and some unused functions
Change-Id: Iace3118a3a8a6d494b89d4476ff3160652e940ba
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index eabb660..9fe179a 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -65,6 +65,7 @@
#include
#include "mathmlexport.hxx"
+#include "register.hxx"
#include
#include
#include
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 5bbd122..dcc29f2 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -63,6 +63,7 @@ one go*/
#include
#include "mathmlimport.hxx"
+#include "register.hxx"
#include
#include
#include
@@ -563,11 +564,6 @@ public:
const OUString& rLName)
: SvXMLImportContext(rImport, nPrfx, rLName) {}
-const SmXMLImport& GetSmImport() const
-{
-return (const SmXMLImport&)GetImport();
-}
-
SmXMLImport& GetSmImport()
{
return (SmXMLImport&)GetImport();
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 5b5baab..24319df 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -27,6 +27,7 @@
#include "mathtype.hxx"
#include "visitors.hxx"
+#include
#include
#include
#include
@@ -51,14 +52,10 @@
// Usually a MapMode of 1/100th mm will be used.
-class SmTmpDevice
+class SmTmpDevice: private boost::noncopyable
{
OutputDevice &rOutDev;
-// disallow use of copy-constructor and assignment-operator
-SmTmpDevice(const SmTmpDevice &rTmpDev);
-SmTmpDevice & operator = (const SmTmpDevice &rTmpDev);
-
Color Impl_GetColor( const Color& rColor );
public:
@@ -67,10 +64,6 @@ public:
void SetFont(const Font &rNewFont);
-void SetLineColor( const Color& rColor ){ rOutDev.SetLineColor(
Impl_GetColor(rColor) ); }
-void SetFillColor( const Color& rColor ){ rOutDev.SetFillColor(
Impl_GetColor(rColor) ); }
-void SetTextColor( const Color& rColor ){ rOutDev.SetTextColor(
Impl_GetColor(rColor) ); }
-
operator OutputDevice & () { return rOutDev; }
};
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index efde8e6..063872a 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -24,6 +24,7 @@
#include
+#include "register.hxx"
#include "smdll.hxx"
#include "document.hxx"
#include "unomodel.hxx"
@@ -32,72 +33,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
-//Math document
-extern Sequence< OUString > SAL_CALL
-SmDocument_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-SmDocument_getImplementationName() throw();
-extern Reference< XInterface >SAL_CALL
-SmDocument_createInstance(const Reference< XMultiServiceFactory > &
rSMgr, const sal_uInt64 _nCreationFlags) throw( Exception );
-
-//MathML import
-extern Sequence< OUString > SAL_CALL
-SmXMLImport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-SmXMLImport_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-SmXMLImport_createInstance(const Reference< XMultiServiceFactory > &
rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-SmXMLImportMeta_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-SmXMLImportMeta_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-SmXMLImportMeta_createInstance(const Reference< XMultiServiceFactory >
& rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-SmXMLImportSettings_getSupportedServiceNames() throw();
-extern OUString SAL_CALL SmXMLImportSettings_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-SmXMLImportSettings_createInstance(const Reference<
XMultiServiceFactory > & rSMgr) throw( Exception );
-
-//MathML export
-extern Sequence< OUString > SAL_CALL
-SmXMLExport_getSupportedServiceNames() throw();
-extern OUString SAL_CALL
-SmXMLExport_getImplementationName() throw();
-extern Reference< XInterface > SAL_CALL
-SmXMLExport_createInstance(const Reference< XMultiServiceFactory > &
rSMgr) throw( Exception );
-extern Sequence< OUString > SAL_CALL
-SmXMLExportMetaOOO_getSupportedServiceNames() throw();
-extern OU
[Libreoffice-commits] core.git: writerfilter/inc writerfilter/source
writerfilter/inc/resourcemodel/QNameToString.hxx |2
writerfilter/source/dmapper/BorderHandler.cxx|1
writerfilter/source/dmapper/DomainMapper.cxx | 45 +--
writerfilter/source/ooxml/Handler.cxx|1
writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx |6 ++
writerfilter/source/resourcemodel/qnametostrcore.cxx |2
writerfilter/source/rtftok/rtfsprm.cxx |6 ++
7 files changed, 47 insertions(+), 16 deletions(-)
New commits:
commit f2b815de56a2c2cfe6bb3f757cd70f7bbcbfe562
Author: Jan Holesovsky
Date: Mon Apr 14 19:45:32 2014 +0200
writerfilter: QNameToString is for debugging, avoid using that in real code.
Change-Id: I8462204bb0fe4da8de1d05a42347466e40e54169
diff --git a/writerfilter/inc/resourcemodel/QNameToString.hxx
b/writerfilter/inc/resourcemodel/QNameToString.hxx
index 8090882..95e8cb1f 100644
--- a/writerfilter/inc/resourcemodel/QNameToString.hxx
+++ b/writerfilter/inc/resourcemodel/QNameToString.hxx
@@ -69,7 +69,9 @@ protected:
public:
static Pointer_t Instance();
+#ifdef DEBUG_LOGGING
string operator()(sal_uInt32 nId);
+#endif
};
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx
b/writerfilter/source/dmapper/BorderHandler.cxx
index dd82dd7..efa6be2 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -19,7 +19,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 23152e6..cb2c8f7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -911,13 +911,14 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
m_pImpl->m_bIgnoreNextPara = true;
break;
case NS_ooxml::LN_CT_DataBinding_prefixMappings:
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_DataBinding_prefixMappings", sStringValue);
+break;
case NS_ooxml::LN_CT_DataBinding_xpath:
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_DataBinding_xpath", sStringValue);
+break;
case NS_ooxml::LN_CT_DataBinding_storeItemID:
-{
-OUString sName =
OUString::createFromAscii((*QNameToString::Instance())(nName).c_str());
-m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag, sName,
sStringValue);
-}
-break;
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_DataBinding_storeItemID", sStringValue);
+break;
default:
{
#if OSL_DEBUG_LEVEL > 0
@@ -2268,7 +2269,21 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
case NS_ooxml::LN_CT_SdtPr_id:
{
// this is an unsupported SDT property, create a grab bag for it
-OUString sName =
OUString::createFromAscii((*QNameToString::Instance())(nSprmId).c_str());
+OUString sName;
+switch (nSprmId)
+{
+case NS_ooxml::LN_CT_SdtPr_dataBinding: sName =
"ooxml:CT_SdtPr_dataBinding"; break;
+case NS_ooxml::LN_CT_SdtPr_equation:sName =
"ooxml:CT_SdtPr_equation"; break;
+case NS_ooxml::LN_CT_SdtPr_checkbox:sName =
"ooxml:CT_SdtPr_checkbox"; break;
+case NS_ooxml::LN_CT_SdtPr_docPartObj: sName =
"ooxml:CT_SdtPr_docPartObj"; break;
+case NS_ooxml::LN_CT_SdtPr_docPartList: sName =
"ooxml:CT_SdtPr_docPartList"; break;
+case NS_ooxml::LN_CT_SdtPr_picture: sName =
"ooxml:CT_SdtPr_picture"; break;
+case NS_ooxml::LN_CT_SdtPr_citation:sName =
"ooxml:CT_SdtPr_citation"; break;
+case NS_ooxml::LN_CT_SdtPr_group: sName =
"ooxml:CT_SdtPr_group"; break;
+case NS_ooxml::LN_CT_SdtPr_text:sName =
"ooxml:CT_SdtPr_text"; break;
+case NS_ooxml::LN_CT_SdtPr_id: sName =
"ooxml:CT_SdtPr_id"; break;
+default: assert(false);
+};
enableInteropGrabBag(sName);
// process subitems
@@ -2281,17 +2296,23 @@ void DomainMapper::sprmWithProps( Sprm& rSprm,
PropertyMapPtr rContext )
}
break;
case NS_ooxml::LN_CT_SdtCheckbox_checked:
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_SdtCheckbox_checked", sStringValue);
+break;
case NS_ooxml::LN_CT_SdtCheckbox_checkedState:
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_SdtCheckbox_checkedState", sStringValue);
+break;
case NS_ooxml::LN_CT_SdtCheckbox_uncheckedState:
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_SdtCheckbox_uncheckedState", sStringValue);
+break;
case NS_ooxml::LN_CT_SdtDocPart_docPartGallery:
+m_pImpl->appendGrabBag(m_pImpl->m_aInteropGrabBag,
"ooxml:CT_SdtDocPart_d
[Libreoffice-commits] core.git: i18npool/Module_i18npool.mk
i18npool/Module_i18npool.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6ba9692d8bbe3e3c245aca9a7c928e81178d05f1 Author: Tor Lillqvist Date: Mon Apr 14 20:09:58 2014 +0300 Typo Change-Id: I888b4fcd6ad1bbdc95a1f6e17d2d35de193c3473 diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 06ccf30..022d053 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,i18npool,\ CustomTarget_localedata \ CustomTarget_textconversion \ Library_collator_data \ - $(if $(filter-ouut IOS,$(OS)), \ + $(if $(filter-out IOS,$(OS)), \ Library_dict_ja \ Library_dict_zh) \ Library_i18npool \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/document.hxx|1 +
sc/source/core/data/documen2.cxx |2 +-
sc/source/core/data/document.cxx |6 ++
sc/source/core/data/document10.cxx |7 +++
4 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit bb1bea8e01f899e43da4372fc4121e387d60102c
Author: Kohei Yoshida
Date: Mon Apr 14 11:23:23 2014 -0400
fdo#77209: Share string pool with clip documents.
We do the same with undo documents, and it will only make sense to do
the same with clip documents as well. Also, put the sharing part into
a common method (for ease of tracking).
(cherry picked from commit 8f403051968298fbabd61de82fbb6a77762c83cc)
Conflicts:
sc/inc/document.hxx
Change-Id: I342b22d95374ee06d16318a66ffea0ac5b42621c
Reviewed-on: https://gerrit.libreoffice.org/9005
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index b4e86f3..8c8cbf1 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2123,6 +2123,7 @@ private: // CLOOK-Impl-methods
std::map< SCTAB, ScSortParam > mSheetSortParams;
+void SharePooledResources( ScDocument* pSrcDoc );
};
inline void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index daa4e2a..eb3eab2 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -478,7 +478,7 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc )
Clear();
-xPoolHelper = pSourceDoc->xPoolHelper;
+SharePooledResources(pSourceDoc);
// bedingte Formate / Gueltigkeiten
//! Vorlagen kopieren?
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 90128ef..bc66735 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1831,8 +1831,7 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc,
const ScMarkData& rTabSe
{
Clear();
-xPoolHelper = pSrcDoc->xPoolHelper;
-
+SharePooledResources(pSrcDoc);
OUString aString;
for (SCTAB nTab = 0; nTab <= rTabSelection.GetLastSelected(); nTab++)
@@ -1867,8 +1866,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB
nTab1, SCTAB nTab2,
Clear();
// Undo document shares its pooled resources with the source document.
-xPoolHelper = pSrcDoc->xPoolHelper;
-mpCellStringPool = pSrcDoc->mpCellStringPool;
+SharePooledResources(pSrcDoc);
if (pSrcDoc->pShell->GetMedium())
maFileURL =
pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index ba95499..823f992 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
// Add totally brand-new methods to this source file.
@@ -67,4 +68,10 @@ void ScDocument::PostprocessRangeNameUpdate()
}
}
+void ScDocument::SharePooledResources( ScDocument* pSrcDoc )
+{
+xPoolHelper = pSrcDoc->xPoolHelper;
+mpCellStringPool = pSrcDoc->mpCellStringPool;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18npool/Module_i18npool.mk
i18npool/Module_i18npool.mk |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit bd92bfdf8eca1217877192cb80a7eccca2659a6c Author: Tor Lillqvist Date: Mon Apr 14 19:40:36 2014 +0300 Need to skip these now on iOS Change-Id: I4bf25a30152d3cbbcc2fae05e40accdde1548298 diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk index 73b0110..06ccf30 100644 --- a/i18npool/Module_i18npool.mk +++ b/i18npool/Module_i18npool.mk @@ -16,8 +16,9 @@ $(eval $(call gb_Module_add_targets,i18npool,\ CustomTarget_localedata \ CustomTarget_textconversion \ Library_collator_data \ - Library_dict_ja \ - Library_dict_zh \ + $(if $(filter-ouut IOS,$(OS)), \ + Library_dict_ja \ + Library_dict_zh) \ Library_i18npool \ Library_i18nsearch \ Library_index_data \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help with fdo#49091
Hello everyone, I have been working on fdo#49091 ( https://bugs.freedesktop.org/show_bug.cgi?id=49091) After some debugging, I found out the reason that Alt+Left or Alt+Right and many other combinations don't work is because of the various cases in http://opengrok.libreoffice.org/xref/core/sw/source/core/uibase/docvw/edtwin.cxx#1614, followed by http://opengrok.libreoffice.org/xref/core/sw/source/core/uibase/docvw/edtwin.cxx#2203, where eKeyState gets set to KS_End, that is, eKeyState never gets set to KS_KeyToView and hence the action is never called! I need some help in moving forward with this one. -- Thanks, Rachit Gupta ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx |8 -
slideshow/source/engine/animationnodes/generateevent.cxx |1
slideshow/source/engine/shapes/drawinglayeranimation.cxx |1
slideshow/source/engine/slide/layer.cxx |2
slideshow/source/engine/slide/userpaintoverlay.cxx | 10 -
slideshow/source/engine/sp_debug.cxx | 50
---
slideshow/source/engine/usereventqueue.cxx | 63
--
slideshow/source/inc/usereventqueue.hxx |3
8 files changed, 5 insertions(+), 133 deletions(-)
New commits:
commit a49b453ad32e155217e51affc2a0b1a1b09174dd
Author: Stephan Bergmann
Date: Mon Apr 14 18:10:00 2014 +0200
Clean up function declarations and some unused functions
Change-Id: Ia821ca4d03a467620b3ea6ea2520f0d177a5724d
diff --git
a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 0440d9b..56a080b 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -636,14 +636,6 @@ inline basegfx::B2DVector clamp(const basegfx::B2DVector&
v)
min(max(v.getY(),-1.0),1.0));
}
-// TODO(Q3): extract to basegfx
-inline basegfx::B3DVector clamp(const basegfx::B3DVector& v)
-{
-return basegfx::B3DVector(min(max(v.getX(),-1.0),1.0),
- min(max(v.getY(),-1.0),1.0),
- min(max(v.getZ(),-1.0),1.0));
-}
-
inline double randFromNeg1to1()
{
return ( ( static_cast( rand() ) / static_cast( RAND_MAX )
) * 2.0 ) - 1.0;
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx
b/slideshow/source/engine/animationnodes/generateevent.cxx
index 6e44563..65a3421 100644
--- a/slideshow/source/engine/animationnodes/generateevent.cxx
+++ b/slideshow/source/engine/animationnodes/generateevent.cxx
@@ -29,6 +29,7 @@
#include
#include
+#include "generateevent.hxx"
#include "shape.hxx"
#include "subsettableshapemanager.hxx"
#include "usereventqueue.hxx"
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index ea5f511..8419301 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -42,6 +42,7 @@
#include "activity.hxx"
#include "wakeupevent.hxx"
#include "eventqueue.hxx"
+#include "drawinglayeranimation.hxx"
#include "drawshapesubsetting.hxx"
#include "drawshape.hxx"
#include "shapesubset.hxx"
diff --git a/slideshow/source/engine/slide/layer.cxx
b/slideshow/source/engine/slide/layer.cxx
index 42af078..f6e2eab 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -232,8 +232,6 @@ namespace slideshow
~LayerEndUpdate() { if(mpLayer) mpLayer->endUpdate(); }
-void dismiss() { mpLayer.reset(); }
-
private:
LayerSharedPtr mpLayer;
};
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx
b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 142f889..9f56ae0 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -444,16 +444,6 @@ namespace slideshow
return false; // did not handle the event
}
-
-void update_settings( bool bUserPaintEnabled, RGBColor const&
aUserPaintColor, double dUserPaintStrokeWidth )
-{
-maStrokeColor = aUserPaintColor;
-mnStrokeWidth = dUserPaintStrokeWidth;
-mbActive = bUserPaintEnabled;
-if( !mbActive )
-disable();
-}
-
private:
ScreenUpdater& mrScreenUpdater;
UnoViewVector maViews;
diff --git a/slideshow/source/engine/sp_debug.cxx
b/slideshow/source/engine/sp_debug.cxx
index c481401..a949809 100644
--- a/slideshow/source/engine/sp_debug.cxx
+++ b/slideshow/source/engine/sp_debug.cxx
@@ -32,8 +32,11 @@
#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
#include
+#include
+#include
#include
#include
+#include
#include
#include
#include
@@ -192,53 +195,6 @@ std::size_t find_unreachable_objects(bool report)
return m2.size();
}
-typedef std::deque< boost::shared_ptr > free_list_type;
-
-static void scan_and_free(void * area, size_t size, map2_type const & m2,
free_list_type & free)
-{
-unsigned char * p = static_cast(area);
-
-for(size_t n = 0; n + sizeof(shared_ptr_layout) <= size; p +=
pointer_align, n += pointer_align)
-{
-shared_ptr_layout * q = reinterpret_cast(p);
-
-if(q->pn.id == boost::detail::
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-6' - sw/source
sw/source/ui/docvw/edtwin.cxx | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
New commits:
commit a0fb0d938434477898ee8b54bc7da523d5120ea0
Author: Lennard Wasserthal
Date: Sat Apr 5 11:55:24 2014 +0200
fdo#69157 Apply object-in front selection on mouseUp
Before, all selection was recklessly replaced when you clicked something
else than a scaling handle (or the like).
It caused bug 69157.
But now, you can still drag the frame by gripping the interior one.
Btw, that the timer did not correctly start was because of the return
statement in the prior state.
Change-Id: I5e02cfb2d5fe9cdb9fd7f50d0c961dcc418fadd6
Signed-off-by: Lennard Wasserthal
Signed-off-by: Michael Stahl
(cherry picked from commit 351ab7b879a1e5bf879600bf47909181029a4d11)
Reviewed-on: https://gerrit.libreoffice.org/8907
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
(cherry picked from commit c7cec7bb9ea7ef0aaa18a5c39eca13c446f974c5)
Reviewed-on: https://gerrit.libreoffice.org/8935
Reviewed-by: David Tardon
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3dd87c0..cd838c0 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -2618,8 +2618,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
SwWrtShell &rSh = m_rView.GetWrtShell();
-SdrObject* pObj;
-SdrPageView* pPV;
// We have to check if a context menu is shown and we have an UI
// active inplace client. In that case we have to ignore the mouse
// button down event. Otherwise we would crash (context menu has been
@@ -2936,12 +2934,6 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
// only if no position to size was hit.
if (!bHitHandle)
{
-if (pSdrView->PickObj(aDocPos,
pSdrView->getHitTolLog(), pObj, pPV, SDRSEARCH_ALSOONMASTER |
SDRSEARCH_BEFOREMARK))
-{
-pSdrView->UnmarkAllObj();
-
pSdrView->MarkObj(pObj,pPV,false,false);
-return;
-}
StartDDTimer();
SwEditWin::m_nDDStartPosY = aDocPos.Y();
SwEditWin::m_nDDStartPosX = aDocPos.X();
@@ -4029,6 +4021,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
*/
void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
{
+SdrObject* pObj;
+SdrPageView* pPV;
bool bCallBase = true;
sal_Bool bCallShadowCrsr = m_bWasShdwCrsr;
@@ -4080,6 +4074,15 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
bFrmDrag = false;
}
bNoInterrupt = false;
+const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
+if ((PixelToLogic(m_aStartPos).Y() == (aDocPos.Y())) &&
(PixelToLogic(m_aStartPos).X() == (aDocPos.X(//To make sure it was not moved
+{
+if (pSdrView->PickObj(aDocPos, pSdrView->getHitTolLog(), pObj,
pPV, SDRSEARCH_ALSOONMASTER ))
+{
+pSdrView->UnmarkAllObj();
+pSdrView->MarkObj(pObj,pPV,false,false);
+}
+}
ReleaseMouse();
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/inc sc/qa sc/source
sc/inc/document.hxx|2 +
sc/qa/unit/ucalc.cxx | 52 +++--
sc/source/core/data/documen2.cxx |2 -
sc/source/core/data/document.cxx |6 +---
sc/source/core/data/document10.cxx |7
5 files changed, 50 insertions(+), 19 deletions(-)
New commits:
commit 8f403051968298fbabd61de82fbb6a77762c83cc
Author: Kohei Yoshida
Date: Mon Apr 14 11:23:23 2014 -0400
fdo#77209: Share string pool with clip documents.
We do the same with undo documents, and it will only make sense to do
the same with clip documents as well. Also, put the sharing part into
a common method (for ease of tracking).
Change-Id: I342b22d95374ee06d16318a66ffea0ac5b42621c
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6fe5f9f..582d086 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -2147,6 +2147,8 @@ private: // CLOOK-Impl-methods
SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol ) const;
SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRow1, SCROW nRow2 )
const;
bool ReservePatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserve );
+
+void SharePooledResources( ScDocument* pSrcDoc );
};
inline void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
{
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 3390f8a..1ea05ca 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -464,7 +464,7 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc )
Clear();
-xPoolHelper = pSourceDoc->xPoolHelper;
+SharePooledResources(pSourceDoc);
// bedingte Formate / Gueltigkeiten
//! Vorlagen kopieren?
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index b5f412b..4f90b2f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1831,8 +1831,7 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc,
const ScMarkData& rTabSe
{
Clear();
-xPoolHelper = pSrcDoc->xPoolHelper;
-
+SharePooledResources(pSrcDoc);
OUString aString;
for (SCTAB nTab = 0; nTab <= rTabSelection.GetLastSelected(); nTab++)
@@ -1867,8 +1866,7 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB
nTab1, SCTAB nTab2,
Clear();
// Undo document shares its pooled resources with the source document.
-xPoolHelper = pSrcDoc->xPoolHelper;
-mpCellStringPool = pSrcDoc->mpCellStringPool;
+SharePooledResources(pSrcDoc);
if (pSrcDoc->pShell->GetMedium())
maFileURL =
pSrcDoc->pShell->GetMedium()->GetURLObject().GetMainURL(INetURLObject::DECODE_TO_IURI);
diff --git a/sc/source/core/data/document10.cxx
b/sc/source/core/data/document10.cxx
index e4a2ff1..a04e8f9 100644
--- a/sc/source/core/data/document10.cxx
+++ b/sc/source/core/data/document10.cxx
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
// Add totally brand-new methods to this source file.
@@ -263,4 +264,10 @@ void ScDocument::PostprocessRangeNameUpdate()
}
}
+void ScDocument::SharePooledResources( ScDocument* pSrcDoc )
+{
+xPoolHelper = pSrcDoc->xPoolHelper;
+mpCellStringPool = pSrcDoc->mpCellStringPool;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 85a070f93f4dc02a1c0142e4e8f03bde55227e76
Author: Kohei Yoshida
Date: Mon Apr 14 11:22:23 2014 -0400
fdo#77209: Adjust this test to cover clip document use case as well.
Turns out that we do need to share pooled resources with clip documents
in addition to undo documents.
Change-Id: If220c2d4bfc2bece9e884e034525e72dff8e3d66
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 06ef566..7563012 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -599,6 +599,36 @@ void Test::testSharedStringPool()
void Test::testSharedStringPoolUndoDoc()
{
+struct
+{
+bool check( ScDocument& rSrcDoc, ScDocument& rCopyDoc )
+{
+// Copy A1:A4 to the undo document.
+for (SCROW i = 0; i <= 4; ++i)
+{
+ScAddress aPos(0,i,0);
+rCopyDoc.SetString(aPos, rSrcDoc.GetString(aPos));
+}
+
+// String values in A1:A4 should have identical hash.
+for (SCROW i = 0; i <= 4; ++i)
+{
+ScAddress aPos(0,i,0);
+svl::SharedString aSS1 = rSrcDoc.GetSharedString(aPos);
+svl::SharedString aSS2 = rCopyDoc.GetSharedString(aPos);
+if (aSS1.getDataIgnoreCase() != aSS2.getDataIgnoreCase())
+{
+cerr << "String hash values are not equal at row " << (i+1)
+<< " for string '" << aSS1.getString() << "'" << endl;
+return false;
+}
+}
+
+return true;
+}
+
+} aTest;
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/ooxml/qnametostr.xsl |2 ++
writerfilter/source/resourcemodel/qnametostrcore.cxx |6 ++
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit fabea153cfe1ed109d2724b873655c254a152a38
Author: Jan Holesovsky
Date: Mon Apr 14 16:41:15 2014 +0200
Compile the debugging strings in only if we are about to use them.
Saves us tons of string literals.
Change-Id: Ieb7ac52e7493d692e7ed56552350b8781ec6b500
diff --git a/writerfilter/source/ooxml/qnametostr.xsl
b/writerfilter/source/ooxml/qnametostr.xsl
index 5d09c8b..cfcbad0 100644
--- a/writerfilter/source/ooxml/qnametostr.xsl
+++ b/writerfilter/source/ooxml/qnametostr.xsl
@@ -60,6 +60,7 @@
void QNameToString::init_ooxml()
{
+#ifdef DEBUG_LOGGING
/* ooxml */
@@ -75,6 +76,7 @@ void QNameToString::init_ooxml()
+#endif
}
diff --git a/writerfilter/source/resourcemodel/qnametostrcore.cxx
b/writerfilter/source/resourcemodel/qnametostrcore.cxx
index 9f5d970..a473753 100644
--- a/writerfilter/source/resourcemodel/qnametostrcore.cxx
+++ b/writerfilter/source/resourcemodel/qnametostrcore.cxx
@@ -33,14 +33,12 @@ QNameToString::Pointer_t QNameToString::Instance()
string QNameToString::operator()(Id qName)
{
-string sResult;
-
Map::const_iterator aIt = mMap.find(qName);
if (aIt != mMap.end())
-sResult = aIt->second;
+return aIt->second;
-return mMap[qName];
+return string();
}
QNameToString::QNameToString()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/IOS_ARM_GCC.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f62b06eb1d05306601d4736973fc16a17666 Author: Ptyl Dragon Date: Mon Apr 14 17:25:37 2014 +0300 Use -Os instead of -O3 Change-Id: I3bc3397c6a505c758703e506474657fa97ef51bd diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 8d8406a..398fc7a 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -26,7 +26,7 @@ ifeq ($(CXX),) $(error You must set CXX in the environment. See README.cross for example.) endif -gb_COMPILERDEFAULTOPTFLAGS := -O3 +gb_COMPILERDEFAULTOPTFLAGS := -Os include $(GBUILDDIR)/platform/com_GCC_defs.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: fdo70798 Add Excel 2010 functions to Calc
Hi Winfried, On Monday, 2014-04-14 13:03:40 +0200, Winfried Donkers wrote: > AFAICS there's only one Excel 2010 function left to be added to Calc: > AGGREGATE. Yup :-) At least of those statistics functions we identified.. > I can add this function with partial functionality: all aggregate functions > will be available, but the various filter options will not all be implemented. > I think this way most of the functionality will be available in Calc. That would be a starting point. > The remaining filtering options will take some time, I reckon, as I don't > think the current code is prepared for these options. Just make sure that if a filter option is not supported the function returns an error in that case. For the "ignore errors" options we'll have to provide either an option to existing subfunctions or implement their counterparts (depends on complexity). "Ignore nested SUBTOTAL and AGGREGATE functions" is similar to SUBTOTAL with the addition of AGGREGATE. "Ignore hidden rows" is somewhat similar to how it is handled in SUBTOTAL, just that SUBTOTAL ignores only filtered rows in the first set of its options, not all hidden. Actually needs to be clarified if Excel really ignores all hidden or only filtered. SUBTOTAL has a second set of options that ignores not only filtered rows but all hidden rows, we also need to implement that, so AGGREGATE may benefit from it. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpWuoVCeLybT.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - i18npool/CustomTarget_breakiterator.mk i18npool/Executable_gendict.mk i18npool/Library_i18npool.mk i18npool/README i18npool/source ios/CustomTarget_TiledLib
i18npool/CustomTarget_breakiterator.mk |
16 +
i18npool/Executable_gendict.mk |
8
i18npool/Library_i18npool.mk |
6
i18npool/README |
15 +
i18npool/source/breakiterator/gendict.cxx|
111 +-
i18npool/source/breakiterator/xdictionary.cxx|
76 --
ios/CustomTarget_TiledLibreOffice_app.mk |
3
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj |
12 -
ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |
4
ios/lo.xcconfig.in |
1
10 files changed, 209 insertions(+), 43 deletions(-)
New commits:
commit 2d6e8e2b5f41f7fd70293f9dd425dd0a6afc09ab
Author: Tor Lillqvist
Date: Mon Apr 14 17:02:34 2014 +0300
Add a source file for debugging convenience
Change-Id: Ic337ac74b38f7c6591a91cc9d996a23b3a3fdf25
diff --git
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 43cccd4..a0c044d 100644
---
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -40,6 +40,7 @@
/* Begin PBXFileReference section */
BE03BF9118F9648F00620DC7 /* udata.cpp */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = udata.cpp;
path = ../../../workdir/UnpackedTarball/icu/source/common/udata.cpp; sourceTree
= ""; };
BE03BF9218F9A7CC00620DC7 /* icudt52l.dat */ = {isa =
PBXFileReference; lastKnownFileType = file; name = icudt52l.dat; path =
../../../../workdir/UnpackedTarball/icu/source/data/in/icudt52l.dat; sourceTree
= ""; };
+ BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name =
xdictionary.cxx; path = ../../../i18npool/source/breakiterator/xdictionary.cxx;
sourceTree = ""; };
BE0898E81860D42B0021A679 /* brand.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = brand.cxx;
path = ../../../vcl/source/app/brand.cxx; sourceTree = ""; };
BE0898E91860D42B0021A679 /* dbggui.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbggui.cxx;
path = ../../../vcl/source/app/dbggui.cxx; sourceTree = ""; };
BE0898EA1860D42B0021A679 /* dndhelp.cxx */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dndhelp.cxx;
path = ../../../vcl/source/app/dndhelp.cxx; sourceTree = ""; };
@@ -749,6 +750,14 @@
name = icu;
sourceTree = "";
};
+ BE03BF9418FC199B00620DC7 /* i18npool */ = {
+ isa = PBXGroup;
+ children = (
+ BE03BF9518FC1A1C00620DC7 /* xdictionary.cxx */,
+ );
+ name = i18npool;
+ sourceTree = "";
+ };
BE0898E61860D3CD0021A679 /* LibreOffice source files */ = {
isa = PBXGroup;
children = (
@@ -756,6 +765,7 @@
BE9F45F81868393D00B8BE69 /* bridges */,
BE55B10518DAD85E00950228 /* cppu */,
BE35B58A188FFA43001B7439 /* cppuhelper */,
+ BE03BF9418FC199B00620DC7 /* i18npool */,
BE55B10818DB673300950228 /* oox */,
BE82C38818C752760050EB79 /* sal */,
BE35B5A6189051F7001B7439 /* sfx2 */,
commit 0b6fb1f45a179e94bb39f49dd8f245812d753113
Author: Tor Lillqvist
Date: Mon Apr 14 14:31:25 2014 +0300
Put the dict_ja and _zh data in files instead of code for iOS
Map the file(s) into memory on demand. The executable file of an app
needs to be as small as possible. Including additional data files in
an app bundle is fine.
Change-Id: Ife9bfe99a2cf0473d459f38f50dfa3304b39e282
diff --git a/i18npool/CustomTarget_breakiterator.mk
b/i18npool/CustomTarget_breakiterator.mk
index dbe6ab2..fb7f0d9 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -11,6 +11,20 @@ $(eval $(call
gb_CustomTarget_CustomTarget,i18npool/breakiterator))
i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
+ifeq ($(OS),IOS)
+
+$(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
+ $(i18npool_BIDIR)/dict_ja.data $(i18npo
[Libreoffice-commits] core.git: oox/source
oox/source/export/drawingml.cxx | 29 +
1 file changed, 29 insertions(+)
New commits:
commit 4688a4d4fb74cab711ab19743a6783d925626eb1
Author: Katarina Behrens
Date: Thu Apr 10 22:43:38 2014 +0200
fdo#65277: Export text run strikeout property
Change-Id: Id5bd7649a8ffaaf03099bfeab42ea4456ef718ec
Reviewed-on: https://gerrit.libreoffice.org/8925
Tested-by: David Tardon
Reviewed-by: David Tardon
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c41d0bd..a99430a 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -1058,6 +1059,7 @@ void DrawingML::WriteRunProperties( Reference<
XPropertySet > rRun, bool bIsFiel
const char* bold = NULL;
const char* italic = NULL;
const char* underline = NULL;
+const char* strikeout = NULL;
sal_Int32 nSize = 1800;
sal_Int32 nCharEscapement = 0;
@@ -1132,6 +1134,32 @@ void DrawingML::WriteRunProperties( Reference<
XPropertySet > rRun, bool bIsFiel
break;
}
+if ( GETAD( CharStrikeout ) )
+{
+switch ( *((sal_Int16*) mAny.getValue()) )
+{
+case awt::FontStrikeout::NONE :
+ strikeout = "noStrike";
+ break;
+case awt::FontStrikeout::SINGLE :
+// LibO supports further values of character
+// strikeout, OOXML standard (20.1.10.78,
+// ST_TextStrikeType) however specifies only
+// 3 - single, double and none. Approximate
+// the remaining ones by single strike (better
+// some strike than none at all).
+// TODO: figure out how to do this better
+case awt::FontStrikeout::BOLD :
+case awt::FontStrikeout::SLASH :
+case awt::FontStrikeout::X :
+ strikeout = "sngStrike";
+ break;
+case awt::FontStrikeout::DOUBLE :
+ strikeout = "dblStrike";
+ break;
+}
+}
+
if( GETA( CharLocale ) ) {
com::sun::star::lang::Locale aLocale;
mAny >>= aLocale;
@@ -1156,6 +1184,7 @@ void DrawingML::WriteRunProperties( Reference<
XPropertySet > rRun, bool bIsFiel
XML_i, italic,
XML_lang, usLanguage.isEmpty() ? NULL : USS(
usLanguage ),
XML_sz, nSize == 1800 ? NULL : IS( nSize ),
+ XML_strike, strikeout,
XML_u, underline,
XML_baseline, nCharEscapement == 0 ? NULL : IS(
nCharEscapement*1000 ),
FSEND );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmlsecurity/source
xmlsecurity/source/xmlsec/nss/secerror.cxx|1
xmlsecurity/source/xmlsec/nss/secerror.hxx|5 +
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 12 ---
xmlsecurity/source/xmlsec/nss/xsec_nss.cxx|1
xmlsecurity/source/xmlsec/xsec_xmlsec.cxx |7 -
xmlsecurity/source/xmlsec/xsec_xmlsec.hxx | 37 ++
6 files changed, 45 insertions(+), 18 deletions(-)
New commits:
commit bfed8b9c9b76ea8eca7c4938d86b3a6ea6436b6e
Author: Stephan Bergmann
Date: Mon Apr 14 16:00:03 2014 +0200
Clean up function declarations
Change-Id: I448e0cf2abeeafb0f6266baeb95705b3a11705a4
diff --git a/xmlsecurity/source/xmlsec/nss/secerror.cxx
b/xmlsecurity/source/xmlsec/nss/secerror.cxx
index eab5b5e..5aaf4e1 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.cxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.cxx
@@ -19,6 +19,7 @@
#include "secerr.h"
+#include "secerror.hxx"
#include "sslerr.h"
#include "nspr.h"
#include "nss.h"
diff --git a/xmlsecurity/source/xmlsec/nss/secerror.hxx
b/xmlsecurity/source/xmlsec/nss/secerror.hxx
index 8d02873..ded3f19 100644
--- a/xmlsecurity/source/xmlsec/nss/secerror.hxx
+++ b/xmlsecurity/source/xmlsec/nss/secerror.hxx
@@ -20,6 +20,11 @@
#ifndef _XSECERROR_HXX_
#define _XSECERROR_HXX_
+#include
+
+#include
+#include
+
const char *
getCertError(PRErrorCode errNum);
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index 85844e4..91b59e3 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -75,18 +75,6 @@ struct UsageDescription
: usage( i_usage )
, description( i_description )
{}
-
-UsageDescription( const UsageDescription& aDescription )
-: usage( aDescription.usage )
-, description( aDescription.description )
-{}
-
-UsageDescription& operator =( const UsageDescription& aDescription )
-{
-usage = aDescription.usage;
-description = aDescription.description;
-return *this;
-}
};
diff --git a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
index 53bea64..1ad2903 100644
--- a/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
+++ b/xmlsecurity/source/xmlsec/nss/xsec_nss.cxx
@@ -30,6 +30,7 @@
#include "xmlsignature_nssimpl.hxx"
#include "xmlencryption_nssimpl.hxx"
#include "xmlsecuritycontext_nssimpl.hxx"
+#include "xsec_xmlsec.hxx"
#include "securityenvironment_nssimpl.hxx"
using namespace ::rtl;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
index c333b35..c07f301 100644
--- a/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
@@ -25,6 +25,7 @@
#include "serialnumberadapter.hxx"
#include "xmlelementwrapper_xmlsecimpl.hxx"
#include "xmldocumentwrapper_xmlsecimpl.hxx"
+#include "xsec_xmlsec.hxx"
using namespace ::cppu;
using namespace ::com::sun::star::uno;
@@ -33,12 +34,6 @@ using namespace ::com::sun::star::lang;
extern "C"
{
-extern void* nss_component_getFactory( const sal_Char*, void*, void* );
-
-#if defined( XMLSEC_CRYPTO_MSCRYPTO )
-extern void* mscrypt_component_getFactory( const sal_Char*, void*, void* );
-#endif
-
SAL_DLLPUBLIC_EXPORT void* SAL_CALL xsec_xmlsec_component_getFactory( const
sal_Char* pImplName , void* pServiceManager , void* pRegistryKey )
{
void* pRet = 0;
diff --git a/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
new file mode 100644
index 000..5ecdf4e
--- /dev/null
+++ b/xmlsecurity/source/xmlsec/xsec_xmlsec.hxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XSEC_XMLSEC_HXX
+#define INCLUDED_XMLSECURITY_SOURCE_XMLSEC_XSEC_XMLSEC_HXX
+
+#include
+
+extern "C" {
+
+void* nss_component_getFactory( const sal_Char*, void*, void* );
+
+#if defined( XMLSEC_C
[Libreoffice-commits] core.git: scripting/source
scripting/source/dlgprov/DialogModelProvider.cxx |1
scripting/source/provider/BrowseNodeFactoryImpl.cxx |3
scripting/source/provider/MasterScriptProvider.cxx| 15 ---
scripting/source/provider/MasterScriptProvider.hxx| 15 +++
scripting/source/provider/MasterScriptProviderFactory.cxx |1
scripting/source/vbaevents/eventhelper.cxx|3
scripting/source/vbaevents/service.cxx| 45 --
scripting/source/vbaevents/service.hxx| 63 ++
8 files changed, 83 insertions(+), 63 deletions(-)
New commits:
commit 5e3c99315592191c1cb2bf787ac78889846fc453
Author: Stephan Bergmann
Date: Mon Apr 14 15:51:37 2014 +0200
Clean up function declarations
Change-Id: Ie204bb9dc1fb4ded416087f5a3d962924b3dec82
diff --git a/scripting/source/dlgprov/DialogModelProvider.cxx
b/scripting/source/dlgprov/DialogModelProvider.cxx
index 6e61692..3e7d889 100644
--- a/scripting/source/dlgprov/DialogModelProvider.cxx
+++ b/scripting/source/dlgprov/DialogModelProvider.cxx
@@ -38,7 +38,6 @@ using namespace beans;
// component and service helper functions:
OUString SAL_CALL _getImplementationName();
css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames();
-css::uno::Reference< css::uno::XInterface > SAL_CALL _create(
css::uno::Reference< css::uno::XComponentContext > const & context );
} // closing component helper namespace
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 8c938e4..156b387 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -37,6 +37,7 @@
#include
#include "BrowseNodeFactoryImpl.hxx"
+#include "MasterScriptProvider.hxx"
#include "ActiveMSPList.hxx"
#include
@@ -382,7 +383,6 @@ private:
Reference< XAggregation >m_xAggProxy;
Reference< XComponentContext > m_xCtx;
-DefaultBrowseNode();
public:
DefaultBrowseNode( const Reference< XComponentContext >& xCtx, const
Reference< browse::XBrowseNode>& xNode ) : m_xWrappedBrowseNode( xNode ),
m_xWrappedTypeProv( xNode, UNO_QUERY ), m_xCtx( xCtx )
{
@@ -538,7 +538,6 @@ private:
vXBrowseNodes m_vNodes;
OUString m_Name;
-DefaultRootBrowseNode();
public:
DefaultRootBrowseNode( const Reference< XComponentContext >& xCtx )
{
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index 4b66cf8..850d45b 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -56,14 +56,6 @@ using namespace ::sf_misc;
namespace func_provider
{
-// Definitions for MasterScriptProviderFactory global methods.
-
-
-OUString SAL_CALL mspf_getImplementationName() ;
-Reference< XInterface > SAL_CALL mspf_create( Reference< XComponentContext >
const & xComponentContext );
-Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames();
-
-
bool endsWith( const OUString& target,
const OUString& item )
{
@@ -830,13 +822,6 @@ throw( RuntimeException, std::exception )
} // namespace func_provider
-namespace browsenodefactory
-{
-OUString SAL_CALL bnf_getImplementationName() ;
-Reference< XInterface > SAL_CALL bnf_create( Reference< XComponentContext >
const & xComponentContext );
-Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames();
-}
-
namespace scripting_runtimemgr
{
diff --git a/scripting/source/provider/MasterScriptProvider.hxx
b/scripting/source/provider/MasterScriptProvider.hxx
index 2953463..e424c93 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -143,7 +143,20 @@ private:
osl::Mutex m_mutex;
OUString m_sCtxString;
};
-} // namespace func_provider
+
+OUString SAL_CALL mspf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > SAL_CALL mspf_create(
css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > SAL_CALL mspf_getSupportedServiceNames();
+
+}
+
+namespace browsenodefactory
+{
+OUString SAL_CALL bnf_getImplementationName() ;
+css::uno::Reference< css::uno::XInterface > SAL_CALL bnf_create(
css::uno::Reference< css::uno::XComponentContext > const & xComponentContext );
+css::uno::Sequence< OUString > SAL_CALL bnf_getSupportedServiceNames();
+}
+
#endif //_FRAMEWORK_SCRIPT_PROVIDER_XFUNCTIONPROVIDER_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx
b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 3051bc8..547244a 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -24,6 +24,7 @@
#include
#include
+#include "MasterScriptP
[Libreoffice-commits] core.git: 2 commits - codemaker/source filter/source include/filter sc/source sw/source
codemaker/source/cppumaker/cpputype.cxx | 45 +-
filter/source/msfilter/mstoolbar.cxx| 26 ++
include/filter/msfilter/mstoolbar.hxx | 51 -
sc/source/filter/excel/xltoolbar.cxx| 11
sc/source/filter/excel/xltoolbar.hxx| 20 ++--
sw/source/filter/ww8/ww8par.cxx |6 ++
sw/source/filter/ww8/ww8toolbar.cxx | 46 ---
sw/source/filter/ww8/ww8toolbar.hxx | 76
8 files changed, 211 insertions(+), 70 deletions(-)
New commits:
commit 893590f16e9ac10e61f2c1b37e27a11fe2205f42
Author: Jan Holesovsky
Date: Mon Apr 14 15:39:46 2014 +0200
The entry points for these are hidden behind OSL_DEBUG_LEVEL > 1 too.
Change-Id: I728e808ac897aa1be184fb4a8bbbf781eb816cf0
diff --git a/filter/source/msfilter/mstoolbar.cxx
b/filter/source/msfilter/mstoolbar.cxx
index 0d63c51..589b7d9 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -210,6 +210,7 @@ bool TBCHeader::Read( SvStream &rS )
return true;
}
+#if OSL_DEBUG_LEVEL > 1
void TBCHeader::Print( FILE* fp )
{
Indent a;
@@ -226,6 +227,7 @@ void TBCHeader::Print( FILE* fp )
if ( height.get() )
indent_printf(fp," height 0x%d(0x%x)\n", *height, *height);
}
+#endif
TBCData::TBCData( const TBCHeader& Header ) : rHeader( Header )
{
@@ -359,6 +361,7 @@ bool TBCData::ImportToolBarControl(
CustomToolBarImportHelper& helper, std::vect
return true; // just ignore
}
+#if OSL_DEBUG_LEVEL > 1
void TBCData::Print( FILE* fp )
{
Indent a;
@@ -372,6 +375,7 @@ void TBCData::Print( FILE* fp )
controlSpecificInfo->Print( fp );
}
}
+#endif
bool
WString::Read( SvStream &rS )
@@ -408,6 +412,7 @@ TBCExtraInfo::Read( SvStream &rS )
return true;
}
+#if OSL_DEBUG_LEVEL > 1
void
TBCExtraInfo::Print( FILE* fp )
{
@@ -424,8 +429,8 @@ TBCExtraInfo::Print( FILE* fp )
OUStringToOString( wstrParam.getString(), RTL_TEXTENCODING_UTF8
).getStr() );
indent_printf( fp, " tbcu 0x%x\n", tbcu );
indent_printf( fp, " tbmg 0x%x\n", tbmg );
-
}
+#endif
OUString
TBCExtraInfo::getOnAction()
@@ -452,6 +457,7 @@ bool TBCGeneralInfo::Read( SvStream &rS )
return true;
}
+#if OSL_DEBUG_LEVEL > 1
void
TBCGeneralInfo::Print( FILE* fp )
{
@@ -467,6 +473,7 @@ TBCGeneralInfo::Print( FILE* fp )
if ( bFlags & 0x4 )
extraInfo.Print( fp );
}
+#endif
bool
TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper,
std::vector< beans::PropertyValue >& sControlData )
@@ -530,6 +537,7 @@ TBCMenuSpecific::Read( SvStream &rS)
return true;
}
+#if OSL_DEBUG_LEVEL > 1
void
TBCMenuSpecific::Print( FILE* fp )
{
@@ -538,8 +546,8 @@ TBCMenuSpecific::Print( FILE* fp )
indent_printf( fp, " tbid 0x%x\n", static_cast< unsigned int >( tbid ) );
if ( tbid == 1 )
indent_printf( fp, " name %s\n", OUStringToOString(
name->getString(), RTL_TEXTENCODING_UTF8 ).getStr() );
-
}
+#endif
OUString TBCMenuSpecific::Name()
{
@@ -584,6 +592,7 @@ bool TBCBSpecific::Read( SvStream &rS)
}
+#if OSL_DEBUG_LEVEL > 1
void TBCBSpecific::Print( FILE* fp )
{
Indent a;
@@ -612,6 +621,7 @@ void TBCBSpecific::Print( FILE* fp )
bResult = ( wstrAcc.get() != NULL );
indent_printf( fp, " option string present? %s ->%s<-\n", bResult ?
"true" : "false", bResult ? OUStringToOString( wstrAcc->getString(),
RTL_TEXTENCODING_UTF8 ).getStr() : "N/A" );
}
+#endif
TBCBitMap*
TBCBSpecific::getIcon()
@@ -639,6 +649,7 @@ bool TBCComboDropdownSpecific::Read( SvStream &rS)
return true;
}
+#if OSL_DEBUG_LEVEL > 1
void TBCComboDropdownSpecific::Print( FILE* fp)
{
Indent a;
@@ -648,6 +659,7 @@ void TBCComboDropdownSpecific::Print( FILE* fp)
else
indent_printf(fp," no data " );
}
+#endif
TBCCDData::TBCCDData()
: cwstrItems(0)
@@ -681,6 +693,7 @@ bool TBCCDData::Read( SvStream &rS)
return wstrEdit.Read( rS );
}
+#if OSL_DEBUG_LEVEL > 1
void TBCCDData::Print( FILE* fp)
{
Indent a;
@@ -697,6 +710,7 @@ void TBCCDData::Print( FILE* fp)
indent_printf(fp," dxWidth width in pixels 0x%d", dxWidth);
indent_printf(fp," wstrEdit %s", OUStringToOString( wstrEdit.getString(),
RTL_TEXTENCODING_UTF8 ).getStr() );
}
+#endif
TBCBitMap::TBCBitMap() : cbDIB( 0 )
{
@@ -722,12 +736,14 @@ bool TBCBitMap::Read( SvStream& rS)
return ReadDIB(mBitMap, rS, false);
}
+#if OSL_DEBUG_LEVEL > 1
void TBCBitMap::Print( FILE* fp )
{
Indent a;
indent_printf(fp, "[ 0x%x ] TBCBitMap -- dump\n", nOffSet );
indent_printf(fp, " TBCBitMap size of bitmap data 0x%x\n", static_cast<
unsigned int > ( cbDIB ) );
}
+#endif
TB::TB() : bSignature(0x2),
bVersion(0x1),
@@ -754,6 +770,7 @@ bool TB::IsEnabled()
return ( bFlags & 0x01 ) != 0x01;
}
+#if OSL_DEBUG_LEVEL > 1
void TB::Print( FILE* fp )
{
Indent a;
@@ -767,6
[Bug 38885] Remove CreateTextFromNode methods
https://bugs.freedesktop.org/show_bug.cgi?id=38885 Michaël Lefèvre changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |lefevr...@yahoo.fr |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source forms/source
filter/source/xsltfilter/LibXSLTTransformer.cxx |7 ---
filter/source/xsltfilter/OleHandler.cxx |9 +
forms/source/component/EventThread.cxx |8 +++-
forms/source/richtext/richtextengine.cxx|5 ++---
4 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit fbf5599c071c6f3203f8992aba4560be9b3b5e42
Author: Takeshi Abe
Date: Mon Apr 14 21:28:02 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: Id71cb49d8aa241a17efd4cbe217a48f2d7c34e84
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 949f383..82ac99f 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -47,6 +47,7 @@
#include
#include
+#include
using namespace ::rtl;
using namespace ::cppu;
@@ -307,11 +308,11 @@ namespace XSLT
xsltSetGenericDebugFunc(stderr, NULL);
xsltDebugDumpExtensions(NULL);
#endif
-OleHandler* oh = new OleHandler(m_transformer->getComponentContext());
+boost::scoped_ptr oh(new
OleHandler(m_transformer->getComponentContext()));
if (styleSheet)
{
tcontext = xsltNewTransformContext(styleSheet, doc);
-tcontext->_private = static_cast (oh);
+tcontext->_private = static_cast (oh.get());
xsltQuoteUserParams(tcontext, ¶ms[0]);
result = xsltApplyStylesheetUser(styleSheet, doc, 0, 0, 0,
tcontext);
@@ -340,7 +341,7 @@ namespace XSLT
m_transformer->error(msg);
}
closeOutput();
-delete(oh);
+oh.reset();
xsltFreeStylesheet(styleSheet);
xsltFreeTransformContext(tcontext);
xmlFreeDoc(doc);
diff --git a/filter/source/xsltfilter/OleHandler.cxx
b/filter/source/xsltfilter/OleHandler.cxx
index 4610f76..1515174 100644
--- a/filter/source/xsltfilter/OleHandler.cxx
+++ b/filter/source/xsltfilter/OleHandler.cxx
@@ -41,6 +41,7 @@
#include
#include
+#include
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
@@ -128,12 +129,12 @@ namespace XSLT
}
// Decompress the bytes
-::ZipUtils::Inflater* decompresser = new ::ZipUtils::Inflater(false);
+boost::scoped_ptr< ::ZipUtils::Inflater> decompresser(new
::ZipUtils::Inflater(false));
decompresser->setInput(content);
Sequence result(oleLength);
decompresser->doInflateSegment(result, 0, oleLength);
decompresser->end();
-delete decompresser;
+decompresser.reset();
//return the base64 string of the uncompressed data
OUStringBuffer buf(oleLength);
::sax::Converter::encodeBase64(buf, result);
@@ -196,11 +197,11 @@ namespace XSLT
// Compress the bytes
Sequence output(oledata.getLength());
-::ZipUtils::Deflater* compresser = new
::ZipUtils::Deflater((sal_Int32) 3, false);
+boost::scoped_ptr< ::ZipUtils::Deflater> compresser(new
::ZipUtils::Deflater((sal_Int32) 3, false));
compresser->setInputSegment(oledata, 0, oledata.getLength());
compresser->finish();
int compressedDataLength = compresser->doDeflateSegment(output, 0,
oledata.getLength());
-delete(compresser);
+compresser.reset();
//realloc the data length
Sequence compressed(compressedDataLength);
for (int i = 0; i < compressedDataLength; i++) {
diff --git a/forms/source/component/EventThread.cxx
b/forms/source/component/EventThread.cxx
index 6a5b0a6..d385ee8 100644
--- a/forms/source/component/EventThread.cxx
+++ b/forms/source/component/EventThread.cxx
@@ -20,7 +20,7 @@
#include "EventThread.hxx"
#include
#include
-
+#include
namespace frm
{
@@ -176,7 +176,7 @@ void OComponentEventThread::run()
::cppu::OComponentHelper *pCompImpl = m_pCompImpl;
ThreadEvents::iterator firstEvent( m_aEvents.begin() );
-EventObject* pEvt = *firstEvent;
+boost::scoped_ptr pEvt(*firstEvent);
m_aEvents.erase( firstEvent );
ThreadObjects::iterator firstControl( m_aControls.begin() );
@@ -196,10 +196,8 @@ void OComponentEventThread::run()
query_interface(xControlAdapter->queryAdapted(), xControl);
if( xComp.is() )
-processEvent( pCompImpl, pEvt, xControl, bFlag );
+processEvent( pCompImpl, pEvt.get(), xControl, bFlag );
}
-
-delete pEvt;
};
// After a Dispose, we do not know the Control anymore.
diff --git a/forms/source/richtext/richtextengine.cxx
b/forms/source/richtext/richtextengine.cxx
index 4712a61..1a1cb0c 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -35,7 +35,7
[Libreoffice-commits] core.git: vbahelper/source
vbahelper/source/vbahelper/vbaapplicationbase.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit e04c36b4591ffa457f3072ea8d3c0c72211d20c7
Author: Stephan Bergmann
Date: Mon Apr 14 14:23:11 2014 +0200
Clean up function declarations
Change-Id: I0602166c8e6485b68e06bbcc9f0064938facd3fa
diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index af4febc..88b7052 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -33,6 +33,7 @@
#include
#include
+#include
#include
#include
#include
@@ -55,16 +56,12 @@ using namespace ::ooo::vba;
typedef ::std::pair< OUString, ::std::pair< double, double > > VbaTimerInfo;
// VbaTimer==
-class VbaTimer
+class VbaTimer: private boost::noncopyable
{
Timer m_aTimer;
VbaTimerInfo m_aTimerInfo;
::rtl::Reference< VbaApplicationBase > m_xBase;
-// the following declarations are here to prevent the usage of them
-VbaTimer( const VbaTimer& );
-VbaTimer& operator=( const VbaTimer& );
-
public:
VbaTimer()
{}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/CustomTarget_svg.mk sdext/CustomTarget_pdfimport.mk
filter/CustomTarget_svg.mk |2 +- sdext/CustomTarget_pdfimport.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 0f9a75a2c5cadc23a853f919bed8faccd2baf004 Author: Miklos Vajna Date: Mon Apr 14 14:10:19 2014 +0200 sdext: use --switch=2 --readonly-tables gperf options See 73ecb924379b8e665ee94235a353403c5d29eae6 (Use --switch=2 --readonly-tables gperf options, 2014-04-13) for reasoning. Change-Id: Ie1cfe753979d908077134b86587d8de5fa7c2ee8 diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk index eccb8d0..ab313dc 100644 --- a/sdext/CustomTarget_pdfimport.mk +++ b/sdext/CustomTarget_pdfimport.mk @@ -16,6 +16,6 @@ $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx : \ $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \ | $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1) - $(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' $< > $@ + $(GPERF) -C -t -l -L C++ -m 20 --switch=2 --readonly-tables -Z PdfKeywordHash -k'4-5,$$' $< > $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: commit bcccd851765b635a9ed4a33eb47d0e9663106035 Author: Miklos Vajna Date: Mon Apr 14 14:03:52 2014 +0200 filter: use --switch=2 --readonly-tables gperf options See 73ecb924379b8e665ee94235a353403c5d29eae6 (Use --switch=2 --readonly-tables gperf options, 2014-04-13) for reasoning. Change-Id: Ic63747a6cd982557cad8470ae775afa4b3d8d883 diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index 46b802d..2904da9 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -37,7 +37,7 @@ $(filter_GEN_svg_Tokens_hxx) : $(filter_GEN_svg_Tokens_gperf) $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1) $(call gb_Helper_abbreviate_dirs, \ -$(GPERF) --compare-strncmp -C -m 20 $(filter_GEN_svg_Tokens_gperf) \ +$(GPERF) --compare-strncmp -C -m 20 --switch=2 --readonly-tables $(filter_GEN_svg_Tokens_gperf) \ | sed -e "s/(char\*)0/(char\*)0$(COMMA) 0/g" \ > $(filter_GEN_svg_Tokens_cxx)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/core/api/ReportDefinition.cxx |6 +++---
reportdesign/source/core/sdr/UndoEnv.cxx | 10 ++
reportdesign/source/filter/xml/xmlFixedContent.cxx |6 +++---
reportdesign/source/filter/xml/xmlfilter.cxx | 10 +++---
reportdesign/source/ui/dlg/AddField.cxx|6 ++
reportdesign/source/ui/dlg/GroupsSorting.cxx |4 +---
reportdesign/source/ui/dlg/Navigator.cxx |8 +++-
reportdesign/source/ui/report/DesignView.cxx |7 ---
reportdesign/source/ui/report/ReportControllerObserver.cxx |5 ++---
9 files changed, 23 insertions(+), 39 deletions(-)
New commits:
commit a640be7e2d30462e7115fe6d897b6d5ed3fef9f8
Author: Stephan Bergmann
Date: Mon Apr 14 14:21:50 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I367acc372d6b5996430a2c560e776a469b7e0007
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 35260d4..300ea9a 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -121,6 +121,7 @@
#include
#include
+#include
#include
// page styles
@@ -2409,15 +2410,14 @@ OUString SAL_CALL OReportDefinition::getShapeType( )
throw (uno::RuntimeExcepti
typedef ::cppu::WeakImplHelper2< container::XNameContainer,
container::XIndexAccess
> TStylesBASE;
-class OStylesHelper : public ::cppu::BaseMutex, public TStylesBASE
+class OStylesHelper:
+public cppu::BaseMutex, public TStylesBASE, private boost::noncopyable
{
typedef ::std::map< OUString, uno::Any , ::comphelper::UStringMixLess>
TStyleElements;
TStyleElements m_aElements;
::std::vector m_aElementsPos;
uno::Type m_aType;
-OStylesHelper(const OStylesHelper&);
-void operator =(const OStylesHelper&);
protected:
virtual ~OStylesHelper(){}
public:
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 4ce78a9..e39bd24 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -29,6 +29,7 @@
#include "RptResId.hrc"
#include "RptModel.hxx"
+#include
#include
#include
#include
@@ -65,11 +66,6 @@ struct PropertyInfo
{
boolbIsReadonlyOrTransient;
-PropertyInfo()
-:bIsReadonlyOrTransient( false )
-{
-}
-
PropertyInfo( const bool i_bIsTransientOrReadOnly )
:bIsReadonlyOrTransient( i_bIsTransientOrReadOnly )
{
@@ -94,10 +90,8 @@ typedef ::std::map< Reference< XPropertySet >, ObjectInfo,
::comphelper::OInterf
-class OXUndoEnvironmentImpl
+class OXUndoEnvironmentImpl: private boost::noncopyable
{
-OXUndoEnvironmentImpl(OXUndoEnvironmentImpl&);
-void operator =(OXUndoEnvironmentImpl&);
public:
OReportModel& m_rModel;
PropertySetInfoCachem_aPropertySetCache;
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 7fa7397..8f77b44 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -18,6 +18,7 @@
*/
#include "xmlFixedContent.hxx"
#include "xmlfilter.hxx"
+#include
#include
#include
#include
@@ -37,11 +38,10 @@ namespace rptxml
{
using namespace ::com::sun::star;
-class OXMLCharContent : public XMLCharContext
+class OXMLCharContent: public XMLCharContext, private boost::noncopyable
{
OXMLFixedContent* m_pFixedContent;
-OXMLCharContent(const OXMLCharContent&);
-OXMLCharContent operator =(const OXMLCharContent&);
+
public:
OXMLCharContent(
SvXMLImport& rImport,
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 4690abc..908fd7e 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -16,6 +16,10 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
+#include
+
+#include
#include
#include
#include
@@ -77,11 +81,11 @@ using namespace xmloff;
using namespace ::com::sun::star::util;
-class RptMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
+class RptMLMasterStylesContext_Impl:
+public XMLTextMasterStylesContext, private boost::noncopyable
{
ORptFilter& m_rImport;
-RptMLMasterStylesContext_Impl(const RptMLMasterStylesContext_Impl&);
-void operator =(const RptMLMasterStylesContext_Impl&);
+
public:
TYPEINFO_OVERRIDE();
diff --git a/reportdesign/source/ui
[Libreoffice-commits] core.git: oox/inc oox/source
oox/inc/services.hxx | 45 +++
oox/source/core/contexthandler2.cxx |1
oox/source/core/fasttokenhandler.cxx |2
oox/source/core/filterbase.cxx|8 +--
oox/source/core/filterdetect.cxx |2
oox/source/core/services.cxx | 24 --
oox/source/docprop/ooxmldocpropimport.cxx |3 -
oox/source/export/chartexport.cxx |2
oox/source/ole/vbamodule.cxx | 68 --
oox/source/ppt/dgmimport.cxx |6 +-
oox/source/ppt/dgmlayout.cxx |6 +-
oox/source/ppt/pptimport.cxx |6 +-
oox/source/shape/ShapeContextHandler.cxx |3 -
13 files changed, 71 insertions(+), 105 deletions(-)
New commits:
commit e13022a825917ad9bf1d2b16af6b88a4fa97b1cd
Author: Stephan Bergmann
Date: Mon Apr 14 14:15:12 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I2f5b3144e8d4ce3e497a030aa102985c3bc81645
diff --git a/oox/inc/services.hxx b/oox/inc/services.hxx
new file mode 100644
index 000..9090a5b
--- /dev/null
+++ b/oox/inc/services.hxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_OOX_SOURCE_CORE_SERVICES_HXX
+#define INCLUDED_OOX_SOURCE_CORE_SERVICES_HXX
+
+#include
+
+#define DECLARE_FUNCTIONS( className )
\
+extern OUString SAL_CALL className##_getImplementationName();
\
+extern css::uno::Sequence< OUString > SAL_CALL
className##_getSupportedServiceNames(); \
+extern css::uno::Reference< css::uno::XInterface > SAL_CALL
className##_createInstance( \
+const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw
(css::uno::Exception)
+
+namespace oox {
+namespace core {DECLARE_FUNCTIONS( FastTokenHandler ); }
+namespace core {DECLARE_FUNCTIONS( FilterDetect ); }
+namespace docprop { DECLARE_FUNCTIONS( DocumentPropertiesImport ); }
+namespace ppt { DECLARE_FUNCTIONS( PowerPointImport ); }
+namespace ppt { DECLARE_FUNCTIONS( QuickDiagrammingImport );}
+namespace ppt { DECLARE_FUNCTIONS( QuickDiagrammingLayout );}
+namespace shape { DECLARE_FUNCTIONS( ShapeContextHandler ); }
+}
+
+#undef DECLARE_FUNCTIONS
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/core/contexthandler2.cxx
b/oox/source/core/contexthandler2.cxx
index 4e5bf80..0d74d66 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -39,7 +39,6 @@ struct ElementInfo
boolmbTrimSpaces; /// True = trims leading/trailing
spaces from text data.
inline explicit ElementInfo() : maChars( 0), mnElement(
XML_TOKEN_INVALID ), mbTrimSpaces( false ) {}
-ElementInfo( sal_Int32 nElement ) : maChars( 0 ),
mnElement( nElement ), mbTrimSpaces(false) {}
};
diff --git a/oox/source/core/fasttokenhandler.cxx
b/oox/source/core/fasttokenhandler.cxx
index 5bf6102..9764ff3 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -24,6 +24,8 @@
#include "oox/token/tokenmap.hxx"
#include
+#include
+
namespace oox {
namespace core {
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 1b45ea2..6f2b1ae 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include
+
+#include
#include
#include
#include
@@ -68,7 +71,7 @@ struct UrlPool
struct StaticUrlPool : public ::rtl::Static< UrlPool, StaticUrlPool > {};
/** This guard prevents recursive loading/saving of the same document. */
-class DocumentOpenedGuard
+class DocumentOpenedGuard: private boost::noncopyable
{
public:
explicitDocumentOpenedGuard( const OUString& rUrl );
@@ -77,9 +80,6 @@ public:
inline bool isValid() const { r
[Libreoffice-commits] core.git: lotuswordpro/source
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 170
lotuswordpro/source/filter/lwpfilter.cxx| 13 -
2 files changed, 183 deletions(-)
New commits:
commit 6a9271ff833798927d6f5d1b64f836933c87ff73
Author: Stephan Bergmann
Date: Mon Apr 14 13:16:10 2014 +0200
Remove unused code
Change-Id: I4e1e9f8c9b98fa77c8149fc5f876a2eb19e8
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index 72bbf74..0cbc295 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -60,176 +60,6 @@ using com::sun::star::xml::sax::XParser;
// W o r d P r o
static const sal_Int8 header[] = { 0x57, 0x6f, 0x72, 0x64, 0x50, 0x72, 0x6f };
-const sal_Int32 MAXCHARS = 65534;
-
- // Simple xml importer, currently the importer is very very simple
- // it only extracts pure text from the wordpro file. Absolutely no formatting
- // information is currently imported.
- // To reflect the current state of this importer the sax events sent
- // to the document handler are also the simplest possible. In addition to
- // the basic attributes set up for the 'office:document' element
- // all the imported text is inserted into 'text:p' elements.
- // The parser extracts the pure text and creates simple a simple 'text:p'
- // element to contain that text. In the event of the text exceeding
- // MAXCHARS new 'text:p' elements are created as needed
-class SimpleXMLImporter
-{
-private:
-
-uno::Reference< XDocumentHandler > m_xDocHandler;
-std::vector< OUString > m_vStringChunks;
-SvStream& m_InputStream;
-
-bool CheckValidData( sal_Int8 nChar ) const
-{
-if( ( nChar >= 0x20 && nChar <= 0x7E ) && ( nChar != 0X40 ) )
-return true;
-return false;
-}
-
-void addAttribute( SvXMLAttributeList* pAttrList, const char* key, const
char* val )
-{
-pAttrList->AddAttribute( OUString::createFromAscii( key ),
OUString::createFromAscii( val ) );
-}
-
-void writeTextChunk( const OUString& sChunk )
-{
-SvXMLAttributeList *pAttrList = new SvXMLAttributeList();
-uno::Reference < XAttributeList > xAttrList(pAttrList);
-
-pAttrList->AddAttribute( "text:style-name", "Standard" );
-
-m_xDocHandler->startElement( "text:p", xAttrList );
-m_xDocHandler->characters( sChunk );
-m_xDocHandler->endElement( "text:p" );
-}
-
-void writeDocContentPreamble()
-{
-SvXMLAttributeList *pDocContentPropList = new SvXMLAttributeList();
-uno::Reference < XAttributeList > xDocContentList(pDocContentPropList);
-addAttribute( pDocContentPropList, "xmlns:office",
"urn:oasis:names:tc:opendocument:xmlns:office:1.0" );
-addAttribute( pDocContentPropList, "xmlns:style",
"urn:oasis:names:tc:opendocument:xmlns:style:1.0");
-addAttribute( pDocContentPropList, "xmlns:text",
"urn:oasis:names:tc:opendocument:xmlns:text:1.0" );
-addAttribute( pDocContentPropList, "xmlns:table",
"urn:oasis:names:tc:opendocument:xmlns:table:1.0" );
-addAttribute( pDocContentPropList, "xmlns:draw",
"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" );
-addAttribute( pDocContentPropList, "xmlns:fo",
"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" );
-addAttribute( pDocContentPropList, "xmlns:xlink",
"http://www.w3.org/1999/xlink"; );
-addAttribute( pDocContentPropList, "xmlns:dc",
"http://purl.org/dc/elements/1.1/"; );
-addAttribute( pDocContentPropList, "xmlns:meta",
"urn:oasis:names:tc:opendocument:xmlns:meta:1.0" );
-addAttribute( pDocContentPropList, "xmlns:number",
"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" );
-addAttribute( pDocContentPropList, "xmlns:svg",
"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" );
-addAttribute( pDocContentPropList, "xmlns:chart",
"urn:oasis:names:tc:opendocument:xmlns:chart:1.0" );
-addAttribute( pDocContentPropList, "xmlns:dr3d",
"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" );
-addAttribute( pDocContentPropList, "xmlns:math",
"http://www.w3.org/1998/Math/MathML"; );
-addAttribute( pDocContentPropList, "xmlns:form",
"urn:oasis:names:tc:opendocument:xmlns:form:1.0" );
-addAttribute( pDocContentPropList, "xmlns:script",
"urn:oasis:names:tc:opendocument:xmlns:script:1.0" );
-addAttribute( pDocContentPropList, "xmlns:ooo",
"http://openoffice.org/2004/office"; );
-addAttribute( pDocContentPropList, "xmlns:ooow",
"http://openoffice.org/2004/writer"; );
-addAttribute( pDocContentPropList, "xmlns:oooc",
"http://openoffice.org/2004/calc"; );
-addAttribute( pDocContentPropList, "xmlns:dom",
"http://www.w3.org/2001/xml-events"; );
-addAttribute( pDocContent
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/inc/gridwin.hxx |2
sc/source/ui/view/gridwin.cxx | 180 +-
2 files changed, 145 insertions(+), 37 deletions(-)
New commits:
commit f2aa4f23a75b48bb8e0d0c3fefa4de5634677e75
Author: Kohei Yoshida
Date: Fri Apr 11 23:07:49 2014 -0400
fdo#74087: Inspect if a mis-spelled word is at cursor position...
then decide whether to launch a spell candidate menu or a regular context
menu.
(cherry picked from commit cd22c3442389f69fc1cc14dd07b17f5a59498e5e)
Conflicts:
sc/source/ui/view/gridwin.cxx
Change-Id: Ib121e9c6729e068c70ff216391f863639aa01951
Reviewed-on: https://gerrit.libreoffice.org/8943
Reviewed-by: Andras Timar
Tested-by: Andras Timar
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 5ac059c..f67e1f6 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -274,6 +274,8 @@ class ScGridWindow : public Window, public
DropTargetHelper, public DragSourceHe
boolGetEditUrl( const Point& rPos,
OUString* pName=0, OUString* pUrl=0, OUString*
pTarget=0 );
+bool IsSpellErrorAtPos( const Point& rPos, SCCOL nCol1, SCCOL nCol2, SCROW
nRow );
+
boolHitRangeFinder( const Point& rMouse, RfCorner& rCorner,
sal_uInt16* pIndex = NULL,
SCsCOL* pAddX = NULL, SCsROW* pAddY = NULL
);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index c7342e4..c49d9ea 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -135,6 +135,7 @@
#include
#include
+#include
using namespace com::sun::star;
using ::com::sun::star::uno::Sequence;
@@ -2950,6 +2951,10 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
SCsROW nCellY = -1;
pViewData->GetPosFromPixel(aPosPixel.X(), aPosPixel.Y(), eWhich,
nCellX, nCellY);
+bool bSpellError = false;
+SCCOL nColSpellError = nCellX;
+ScRefCellValue aSpellCheckCell;
+
if ( bMouse )
{
ScDocument* pDoc = pViewData->GetDocument();
@@ -2972,14 +2977,39 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
// Selecting this cell is not allowed, neither is context menu.
return;
+if (mpSpellCheckCxt)
+{
+// Find the first string to the left for spell checking in
case the current cell is empty.
+ScAddress aPos(nCellX, nCellY, nTab);
+aSpellCheckCell.assign(*pDoc, aPos);
+while (aSpellCheckCell.meType == CELLTYPE_NONE)
+{
+// Loop until we get the first non-empty cell in the row.
+aPos.IncCol(-1);
+if (aPos.Col() < 0)
+break;
+
+aSpellCheckCell.assign(*pDoc, aPos);
+}
+
+if (aPos.Col() >= 0 && (aSpellCheckCell.meType ==
CELLTYPE_STRING || aSpellCheckCell.meType == CELLTYPE_EDIT))
+nColSpellError = aPos.Col();
+
+bSpellError = (mpSpellCheckCxt->isMisspelled(nColSpellError,
nCellY));
+if (bSpellError)
+{
+// Check and see if a misspelled word is under the mouse
pointer.
+bSpellError = IsSpellErrorAtPos(aPosPixel, nColSpellError,
nCellX, nCellY);
+}
+}
+
// #i18735# First select the item under the mouse pointer.
// This can change the selection, and the view state (edit mode,
etc).
-SelectForContextMenu( aPosPixel, nCellX, nCellY );
+SelectForContextMenu(aPosPixel, bSpellError ? nColSpellError :
nCellX, nCellY);
}
-sal_Bool bDone = false;
-sal_Bool bEdit = pViewData->HasEditView(eWhich);
-bool bSpellError = (mpSpellCheckCxt &&
mpSpellCheckCxt->isMisspelled(nCellX, nCellY));
+bool bDone = false;
+bool bEdit = pViewData->HasEditView(eWhich);
if ( !bEdit )
{
@@ -5114,7 +5144,53 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt,
sal_Bool bUp )
pViewData->GetView()->ResetTimer();
}
-//
+namespace {
+
+SvxAdjust toSvxAdjust( const ScPatternAttr& rPat )
+{
+SvxCellHorJustify eHorJust =
+static_cast(
+static_cast(rPat.GetItem(ATTR_HOR_JUSTIFY)).GetValue());
+
+SvxAdjust eSvxAdjust = SVX_ADJUST_LEFT;
+switch (eHorJust)
+{
+case SVX_HOR_JUSTIFY_LEFT:
+case SVX_HOR_JUSTIFY_REPEAT:// nicht implementiert
+case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell
type
+eSvxAdjust = SVX_ADJUST_LEFT;
+break;
+case SVX_HOR_JUSTIFY_RIGHT:
+
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 74087, which changed state. Bug 74087 Summary: Cell gets activated on cell with mis-spelled word regardless of mouse cursor position. https://bugs.freedesktop.org/show_bug.cgi?id=74087 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/hyphenator/hyphen/hreg.cxx |8 ++--
lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx |6 ++
lingucomponent/source/languageguessing/guesslang.cxx | 10 +++---
lingucomponent/source/spellcheck/spell/sreg.cxx |8 ++--
lingucomponent/source/spellcheck/spell/sspellimp.hxx |6 ++
lingucomponent/source/thesaurus/libnth/nthesimp.hxx |4
lingucomponent/source/thesaurus/libnth/ntreg.cxx |8 ++--
7 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 5b8ca52fe7ebe40761b9ecd84d313f90eba61687
Author: Stephan Bergmann
Date: Mon Apr 14 13:10:53 2014 +0200
Clean up function declarations
Change-Id: Ia811e9d3a6745e75fb6c6876316fde3629d8
diff --git a/lingucomponent/source/hyphenator/hyphen/hreg.cxx
b/lingucomponent/source/hyphenator/hyphen/hreg.cxx
index 9142dfa..493df8b 100644
--- a/lingucomponent/source/hyphenator/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/hyphen/hreg.cxx
@@ -22,15 +22,11 @@
#include
+#include
+
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
-// declaration of external RegEntry-functions defined by the service objects
-extern void * SAL_CALL Hyphenator_getFactory(
-const sal_Char * pImplName,
-XMultiServiceFactory * pServiceManager,
-void * /*pRegistryKey*/ );
-
// definition of the two functions that are used to provide the services
extern "C"
{
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
index c99a954..919c64b 100644
--- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
+++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx
@@ -40,6 +40,8 @@
#include
#include
+#include
+
using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -132,6 +134,10 @@ inline OUString Hyphenator::getImplementationName_Static()
throw()
return OUString( "org.openoffice.lingu.LibHnjHyphenator" );
}
+void * SAL_CALL Hyphenator_getFactory(
+char const * pImplName, css::lang::XMultiServiceFactory * pServiceManager,
+void *);
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index ba7f1f3..b21f9ba 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -19,6 +19,7 @@
#include
+#include
#include
#include
@@ -77,15 +78,13 @@ static osl::Mutex & GetLangGuessMutex()
class LangGuess_Impl :
public ::cppu::WeakImplHelper2<
XLanguageGuessing,
-XServiceInfo >
+XServiceInfo >,
+private boost::noncopyable
{
SimpleGuesser m_aGuesser;
boolm_bInitialized;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
-LangGuess_Impl( const LangGuess_Impl & ); // not defined
-LangGuess_Impl & operator =( const LangGuess_Impl & ); // not defined
-
virtual ~LangGuess_Impl() {}
voidEnsureInitialized();
@@ -108,9 +107,6 @@ public:
// implementation specific
void SetFingerPrintsDB( const OUString &fileName ) throw
(RuntimeException);
-
-static const OUString & SAL_CALL getImplementationName_Static() throw();
-
};
LangGuess_Impl::LangGuess_Impl(css::uno::Reference<
css::uno::XComponentContext > const & rxContext) :
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx
b/lingucomponent/source/spellcheck/spell/sreg.cxx
index e8b75ff..e018a4a 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/lingucomponent/source/spellcheck/spell/sreg.cxx
@@ -22,15 +22,11 @@
#include
+#include
+
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
-// declaration of external RegEntry-functions defined by the service objects
-extern void * SAL_CALL SpellChecker_getFactory(
-const sal_Char * pImplName,
-XMultiServiceFactory * pServiceManager,
-void * /*pRegistryKey*/ );
-
// definition of the two functions that are used to provide the services
extern "C"
{
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
index 9c7c0d8..6aa649c 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.hxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.hxx
@@ -43,6 +43,8 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::linguistic2;
+class Hunspell;
+
class SpellChecker :
public cppu::WeakImplHelper6
<
@@ -119,6 +121,10 @@ inline OUString
SpellChecker::getImplementationName_Static() throw()
return OUString( "org.openoffice.lingu.MySpellSpellChecker" );
}
+void * SAL_CALL SpellChecker_getFactory(
+char const * pImplName, css::lang::XMultiS
fdo70798 Add Excel 2010 functions to Calc
Hi Eike, AFAICS there's only one Excel 2010 function left to be added to Calc: AGGREGATE. I can add this function with partial functionality: all aggregate functions will be available, but the various filter options will not all be implemented. I think this way most of the functionality will be available in Calc. The remaining filtering options will take some time, I reckon, as I don't think the current code is prepared for these options. What do you think? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: hwpfilter/source
hwpfilter/source/attributes.cxx |1 -
hwpfilter/source/cspline.cxx|3 +++
hwpfilter/source/fontmap.cxx|2 ++
hwpfilter/source/fontmap.hxx| 29 +
hwpfilter/source/formula.cxx|4 +---
hwpfilter/source/grammar.cxx|6 ++
hwpfilter/source/grammar.hxx| 31 +++
hwpfilter/source/hutil.cxx |1 +
hwpfilter/source/hwpreader.cxx |3 +--
hwpfilter/source/lexer.cxx |2 ++
hwpfilter/source/lexer.hxx | 29 +
11 files changed, 101 insertions(+), 10 deletions(-)
New commits:
commit 29a96480b09f63bfbffb799729cf09d3693c0054
Author: Stephan Bergmann
Date: Mon Apr 14 13:02:26 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I7eba9260b33e0b92ed997bf624d866644a091f29
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx
index 57cf05b..ea1dc43 100644
--- a/hwpfilter/source/attributes.cxx
+++ b/hwpfilter/source/attributes.cxx
@@ -24,7 +24,6 @@
struct TagAttribute
{
-TagAttribute(){}
TagAttribute( const OUString &rName, const OUString &rType , const
OUString &rValue )
{
sName = rName;
diff --git a/hwpfilter/source/cspline.cxx b/hwpfilter/source/cspline.cxx
index cc238b3..06dde6c 100644
--- a/hwpfilter/source/cspline.cxx
+++ b/hwpfilter/source/cspline.cxx
@@ -47,6 +47,9 @@
// matrix. Therefore for very large N, you may have to worry about memory
// usage.
+#include
+
+#include "cspline.h"
#include "solver.h"
void NaturalSpline (int N, double* x, double* a, double*& b, double*& c,
diff --git a/hwpfilter/source/fontmap.cxx b/hwpfilter/source/fontmap.cxx
index 9ac5f9c..52a0ed0 100644
--- a/hwpfilter/source/fontmap.cxx
+++ b/hwpfilter/source/fontmap.cxx
@@ -24,6 +24,8 @@
#include
#endif
+#include
+
// #i42367# prevent MS compiler from using system locale for parsing
#ifdef _MSC_VER
#pragma setlocale("C")
diff --git a/hwpfilter/source/fontmap.hxx b/hwpfilter/source/fontmap.hxx
new file mode 100644
index 000..f9002e4
--- /dev/null
+++ b/hwpfilter/source/fontmap.hxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_HWPFILTER_SOURCE_FONTMAP_HXX
+#define INCLUDED_HWPFILTER_SOURCE_FONTMAP_HXX
+
+#include
+
+int getRepFamilyName(char const *, char *, double &);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index c6fa80f..52bf27a 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -18,6 +18,7 @@
*/
#include "formula.h"
+#include "grammar.hxx"
#include "mzstring.h"
#include "nodes.h"
@@ -46,9 +47,6 @@ static int indent = 0;
#define indo indent--;
#endif
-extern Node *mainParse(const char *);
-
-
void Formula::makeMathML(Node *res)
{
Node *tmp = res;
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 4ff34a5..be4b591 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -32,15 +32,13 @@
#include
#include
+#include "grammar.hxx"
+#include "lexer.hxx"
#include "nodes.h"
std::list nodelist;
-Node *mainParse(const char *_code);
void yyerror(const char *);
-int yylex();
-void initFlex( const char *s );
-void viewResult(Node *res);
Node *top=0L;
diff --git a/hwpfilter/source/grammar.hxx b/hwpfilter/source/grammar.hxx
new file mode 100644
index 000..334f434
--- /dev/null
+++ b/hwpfilter/source/grammar.hxx
@@ -0,0 +1,31 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE fil
[Libreoffice-commits] core.git: formula/source
formula/source/ui/dlg/formula.cxx | 19 ---
1 file changed, 19 deletions(-)
New commits:
commit 712d2793ec8e54e1d74655ccb4ea5e2b8cc9ca72
Author: Stephan Bergmann
Date: Mon Apr 14 12:49:20 2014 +0200
Remove unused code
Change-Id: I1355317d6baeb180417cb5f1f34038925c1299cf
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index dd8ebfb..d58e5f4 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -69,21 +69,6 @@ namespace formula
{
using namespace ::com::sun::star;
-class OFormulaToken : public IFormulaToken
-{
-sal_Int32 m_nParaCount;
-boolm_bIsFunction;
-
-public:
-OFormulaToken(bool _bFunction,sal_Int32 _nParaCount) :
m_nParaCount(_nParaCount),m_bIsFunction(_bFunction){}
-
-virtual ~OFormulaToken() {}
-
-virtual bool isFunction() const SAL_OVERRIDE { return m_bIsFunction; }
-virtual sal_uInt32 getArgumentCount() const SAL_OVERRIDE { return
m_nParaCount; }
-};
-
-
class FormulaDlg_Impl
{
public:
@@ -108,7 +93,6 @@ namespace formula
voidStoreFormEditData(FormEditData* pEditData);
-voidUpdateArgInput( sal_uInt16 nOffset, sal_uInt16 nInput
);
voidUpdate();
voidUpdate(const OUString& _sExp);
@@ -142,8 +126,6 @@ namespace formula
DECL_LINK(FormulaHdl, void *);
DECL_LINK(FormulaCursorHdl, void *);
DECL_LINK( BtnHdl, PushButton* );
-DECL_LINK( GetEdFocusHdl, ArgInput* );
-DECL_LINK( GetFxFocusHdl, ArgInput* );
DECL_LINK(DblClkHdl, void *);
DECL_LINK(FuncSelHdl, void *);
DECL_LINK(StructSelHdl, void *);
@@ -160,7 +142,6 @@ namespace formula
mutable const sheet::FormulaOpCodeMapEntry*
m_pUnaryOpCodesEnd;
mutable uno::Sequence< sheet::FormulaOpCodeMapEntry >
m_aBinaryOpCodes;
mutable const sheet::FormulaOpCodeMapEntry*
m_pBinaryOpCodesEnd;
-::std::vector< ::boost::shared_ptr > m_aTokens;
::std::map m_aTokenMap;
IFormulaEditorHelper* m_pHelper;
Dialog* m_pParent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
libreoffice@lists.freedesktop.org confira a proposta
libreoffice@lists.freedesktop.org confira a proposta que enviamos para você por R$ 29,90 nos 06 primeiros meses. Nós respeitamos sua privacidade e somos contra o envio não solicitado, se por engano seu email foi cadastrado inadivertidamente pedimos a gentileza de se descadastrar utilizando este Link. Para visualizá-lo on-line, por favor, clique aqui: http://turbomarketing.com.br/display.php?M=14248135&C=5af337d48d9d3ef99bc4956577bf52b1&S=74&L=28&N=22.Caso queira enviar sua camapanha acesse: retorno efetivo. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: forms/source
forms/source/component/CheckBox.cxx|4
forms/source/component/ComboBox.cxx|4
forms/source/component/Currency.cxx|1
forms/source/component/DatabaseForm.cxx|1
forms/source/component/Date.cxx|1
forms/source/component/Filter.cxx |1
forms/source/component/FixedText.cxx |2
forms/source/component/GroupBox.cxx|4
forms/source/component/GroupManager.cxx|9 -
forms/source/component/Hidden.cxx |2
forms/source/component/ListBox.cxx |4
forms/source/component/RadioButton.cxx |4
forms/source/component/imgprod.cxx |3
forms/source/inc/services.hxx | 147 +
forms/source/misc/services.cxx | 77 ---
forms/source/runtime/formoperations.cxx|1
forms/source/xforms/xforms_services.cxx|2
forms/source/xforms/xpathlib/extension.cxx |1
18 files changed, 166 insertions(+), 102 deletions(-)
New commits:
commit 1d057cca8c3970d20d6b6203bd25af11eaf21cf9
Author: Stephan Bergmann
Date: Mon Apr 14 12:46:40 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I47bdc668ecf703d85f4d50c71f1347fb9e8e89d8
diff --git a/forms/source/component/CheckBox.cxx
b/forms/source/component/CheckBox.cxx
index 7ca360d..ccbfed4 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -52,7 +52,7 @@ OCheckBoxControl::OCheckBoxControl(const
Reference& _rxFactor
}
-InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const
Reference& _rxFactory) throw (RuntimeException)
+InterfaceRef SAL_CALL OCheckBoxControl_CreateInstance(const
Reference& _rxFactory)
{
return *(new OCheckBoxControl( comphelper::getComponentContext(_rxFactory)
));
}
@@ -73,7 +73,7 @@ StringSequence SAL_CALL
OCheckBoxControl::getSupportedServiceNames() throw(::com
-InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const
Reference& _rxFactory) throw (RuntimeException)
+InterfaceRef SAL_CALL OCheckBoxModel_CreateInstance(const
Reference& _rxFactory)
{
return *(new OCheckBoxModel( comphelper::getComponentContext(_rxFactory)
));
}
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index c32f209..ceb3a98 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -73,7 +73,7 @@ using namespace ::com::sun::star::form::binding;
// class OComboBoxModel
-InterfaceRef SAL_CALL OComboBoxModel_CreateInstance(const
Reference& _rxFactory) throw (RuntimeException)
+InterfaceRef SAL_CALL OComboBoxModel_CreateInstance(const
Reference& _rxFactory)
{
return (*new OComboBoxModel( comphelper::getComponentContext(_rxFactory)
));
}
@@ -869,7 +869,7 @@ void SAL_CALL OComboBoxModel::disposing( const EventObject&
_rSource ) throw ( R
-InterfaceRef SAL_CALL OComboBoxControl_CreateInstance(const
Reference& _rxFactory) throw (RuntimeException)
+InterfaceRef SAL_CALL OComboBoxControl_CreateInstance(const
Reference& _rxFactory)
{
return *(new OComboBoxControl( comphelper::getComponentContext(_rxFactory)
));
}
diff --git a/forms/source/component/Currency.cxx
b/forms/source/component/Currency.cxx
index c64e07c..54871d1 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -18,6 +18,7 @@
*/
#include "Currency.hxx"
+#include "services.hxx"
#include
#include
#include
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index dc22fcb..c288991 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -19,6 +19,7 @@
#include "componenttools.hxx"
+#include "services.hxx"
#include "DatabaseForm.hxx"
#include "EventThread.hxx"
#include "frm_module.hxx"
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 038d909..1da2c57 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -18,6 +18,7 @@
*/
#include "Date.hxx"
+#include "services.hxx"
#include
#include
#include
diff --git a/forms/source/component/Filter.cxx
b/forms/source/component/Filter.cxx
index 23d4443..976c82f 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -24,6 +24,7 @@
#include "frm_resource.hxx"
#include "property.hrc"
#include "property.hxx"
+#include "services.hxx"
#include
#include
diff --git a/forms/source/component/FixedText.cxx
b/forms/source/component/FixedText.cxx
index 7dd37d6..cf1c197 100644
--- a/forms/source/component/FixedText.cxx
+++ b/forms/source/component/FixedText.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-InterfaceRef SAL_CALL OFixedTextModel_CreateInstance(const
Reference& _rxFactory) throw (RuntimeException)
+InterfaceRef SAL_CALL OFixedTextModel_C
Re: Searching help to build LibreOffice
Hi Oswald, On Saturday, 2014-04-12 23:19:14 +0200, Oswald Luc wrote: > I am trying to build LibreOffice and > make returns an error : > > Failures !!! > Run: 222 Failure total: 1 Failures: 1 Errors: 0 > warn:legacy.osl:21402:1:unotools/source/config/configmgr.cxx:167: > OSL_ASSERT: items_.empty() This is just a warning, the real error was somewhere above and cut off. > [/home/MyLibreOffice/core/workdir/CppunitTest/sc_opencl_test.test] This indicates an error in the Calc OpenCL tests. If the error persists you can configure --disable-opencl and make again, but of course it would be nice to know why it fails or at least what graphics card hardware you have. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpwc3t_WMY4U.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: include/vbahelper
include/vbahelper/vbacollectionimpl.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2346c010eab052aae2485bae522d06766e192cf0
Author: Thomas Arnhold
Date: Mon Apr 14 12:45:51 2014 +0200
fix mac build
Change-Id: I3f29b389543d23bb230964d81ed9a6a946a4414d
diff --git a/include/vbahelper/vbacollectionimpl.hxx
b/include/vbahelper/vbacollectionimpl.hxx
index 47e0891..4698023 100644
--- a/include/vbahelper/vbacollectionimpl.hxx
+++ b/include/vbahelper/vbacollectionimpl.hxx
@@ -309,7 +309,7 @@ public:
// XDefaultMethod
OUString SAL_CALL getDefaultMethodName( ) throw
(css::uno::RuntimeException)
{
-return "Item";
+return OUString("Item");
}
// XEnumerationAccess
virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL
createEnumeration() throw (css::uno::RuntimeException) = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: YouCompleteMe support in VIM
Hi mostthingsweb, On Friday, 2014-04-11 11:59:08 -0700, mostthingsweb wrote: > Has anyone been able to set up semantic analysis for YouCompleteMe in Vim? Well, someone added it to the wiki so I presume he was ;-) https://wiki.documentfoundation.org/User:Philippw If not, you might be interested in the Vim OmniCppComplete plugin, http://www.vim.org/scripts/script.php?script_id=1520 The ctags tags file built with make tags is prepared for it. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpTtYj0oTU3V.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source include/filter
filter/source/flash/swfdialog.cxx|1
filter/source/flash/swffilter.cxx|1
filter/source/flash/swfuno.cxx | 13 --
filter/source/flash/swfuno.hxx | 63 +++
filter/source/flash/swfwriter1.cxx |1
filter/source/graphicfilter/eps/eps.cxx | 12 -
filter/source/graphicfilter/icgm/cgm.cxx |6 --
filter/source/msfilter/msdffimp.cxx |9
filter/source/msfilter/services.cxx | 15 ---
filter/source/msfilter/svdfppt.cxx | 23 ---
filter/source/placeware/filter.cxx |1
filter/source/placeware/filter.hxx | 55 +++
filter/source/placeware/uno.cxx |9
filter/source/svg/svgexport.cxx | 16 ---
include/filter/msfilter/msvbahelper.hxx |8 +++
15 files changed, 134 insertions(+), 99 deletions(-)
New commits:
commit 52494aad920c713e17cd2c5e452a5e634f1bd2e7
Author: Stephan Bergmann
Date: Mon Apr 14 12:25:30 2014 +0200
Clean up function declarations and some unused functions
Change-Id: I68b488d45c77ebf82029bfede98dca2400e02f2f
diff --git a/filter/source/flash/swfdialog.cxx
b/filter/source/flash/swfdialog.cxx
index 9a7b5af..89dcfaf 100644
--- a/filter/source/flash/swfdialog.cxx
+++ b/filter/source/flash/swfdialog.cxx
@@ -19,6 +19,7 @@
#include "swfdialog.hxx"
+#include "swfuno.hxx"
#include "impswfdialog.hxx"
#include
#include
diff --git a/filter/source/flash/swffilter.cxx
b/filter/source/flash/swffilter.cxx
index 1aeac4f..7cf9fd9 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -43,6 +43,7 @@
#include
#include "swfexporter.hxx"
+#include "swfuno.hxx"
#include
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index ec93520..5c4066b 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -24,23 +24,14 @@
#include
#include
+#include
+
using namespace ::rtl;
using namespace ::cppu;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-namespace swf {
-extern OUString FlashExportFilter_getImplementationName() throw (
RuntimeException );
-extern sal_Bool SAL_CALL FlashExportFilter_supportsService( const OUString&
ServiceName ) throw ( RuntimeException );
-extern Sequence< OUString > SAL_CALL
FlashExportFilter_getSupportedServiceNames() throw ( RuntimeException );
-extern Reference< XInterface > SAL_CALL FlashExportFilter_createInstance(
const Reference< XMultiServiceFactory > & rSMgr) throw ( Exception );
-}
-
-extern OUString SWFDialog_getImplementationName () throw
(com::sun::star::uno::RuntimeException);
-extern com::sun::star::uno::Sequence< OUString > SAL_CALL
SWFDialog_getSupportedServiceNames() throw
(com::sun::star::uno::RuntimeException);
-extern com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
SAL_CALL SWFDialog_createInstance( const com::sun::star::uno::Reference<
com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw(
com::sun::star::uno::Exception );
-
using namespace ::swf;
extern "C"
diff --git a/filter/source/flash/swfuno.hxx b/filter/source/flash/swfuno.hxx
new file mode 100644
index 000..1d57453
--- /dev/null
+++ b/filter/source/flash/swfuno.hxx
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_FILTER_SOURCE_FLASH_SWFUNO_HXX
+#define INCLUDED_FILTER_SOURCE_FLASH_SWFUNO_HXX
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+namespace com { namespace sun { namespace star {
+namespace lang { class XMultiSerivceFactory; }
+namespace uno { class XInterface; }
+} } }
+
+namespace swf {
+
+OUString FlashExportFilter_getImplementationName()
+throw (css::uno::RuntimeException);
+
+css::uno::Sequence SAL_CALL
+FlashExportFilter_getSupportedServiceNames() throw
(css::uno::RuntimeException);
+
+css::uno::Reference SAL_CALL
+FlashExportFilter_createInstance(
+css::uno::Reference const & rSMgr)
+throw (css::uno::E
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 73860, which changed state. Bug 73860 Summary: FILEOPEN: Space characters missing in PPTX file (4.2 specific) https://bugs.freedesktop.org/show_bug.cgi?id=73860 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: package/source
package/source/xstor/xstorage.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit a736781e836f5a3b25c6166e2474beb3af7e1f29 Author: Stephan Bergmann Date: Mon Apr 14 11:54:48 2014 +0200 Remove dead function declaration Change-Id: If16e9bed79cc55896cb6c35367935848140da4df diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index d2013f6..62a81dd 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -92,8 +92,6 @@ struct StorInternalData_Impl ~StorInternalData_Impl(); }; -OUString GetNewTempFileURL( const uno::Reference< uno::XComponentContext > xContext ); - // static void OStorage_Impl::completeStorageStreamCopy_Impl( const uno::Reference< io::XStream >& xSource, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/cp-4.1-7'
Tag 'cp-4.1-7' created by Andras Timar at 2014-04-14 10:43 +0200 cp-4.1-7 Changes since cp-4.1-1-6: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-4.1-7'
Tag 'cp-4.1-7' created by Andras Timar at 2014-04-14 10:43 +0200 cp-4.1-7 Changes since cp-4.1-6-119: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/cp-4.1-7'
Tag 'cp-4.1-7' created by Andras Timar at 2014-04-14 10:43 +0200 cp-4.1-7 Changes since cp-4.1-6-1: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: eventattacher/source
eventattacher/source/eventattacher.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit e80c5913ed9db493738507954362884d14cc6287 Author: Stephan Bergmann Date: Mon Apr 14 11:36:03 2014 +0200 Remove dead function declaration Change-Id: I638fade941d369f0b09a016cfdc23cf5c981b8f0 diff --git a/eventattacher/source/eventattacher.cxx b/eventattacher/source/eventattacher.cxx index 28cdfdf..7a7765d 100644 --- a/eventattacher/source/eventattacher.cxx +++ b/eventattacher/source/eventattacher.cxx @@ -219,7 +219,6 @@ public: virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) SAL_OVERRIDE; -static OUString SAL_CALL getImplementationName_Static( ); static Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); // XInitialization ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: embeddedobj/source
embeddedobj/source/msole/olepersist.cxx |1
embeddedobj/source/msole/olepersist.hxx | 42
embeddedobj/source/msole/ownview.cxx|8 --
3 files changed, 44 insertions(+), 7 deletions(-)
New commits:
commit 82d1b40444e65d41bf4807a453cc48bc28cf9c8d
Author: Stephan Bergmann
Date: Mon Apr 14 11:19:42 2014 +0200
Clean up function declarations
Change-Id: Ia33a39c9c8fe25c48c81c53270ca9ce5ef90221c
diff --git a/embeddedobj/source/msole/olepersist.cxx
b/embeddedobj/source/msole/olepersist.cxx
index 19044c4..f403bb4 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
diff --git a/embeddedobj/source/msole/olepersist.hxx
b/embeddedobj/source/msole/olepersist.hxx
new file mode 100644
index 000..c23bf94
--- /dev/null
+++ b/embeddedobj/source/msole/olepersist.hxx
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OLEPERSIST_HXX
+#define INCLUDED_EMBEDDEDOBJ_SOURCE_MSOLE_OLEPERSIST_HXX
+
+#include
+
+#include
+#include
+#include
+#include
+
+namespace com { namespace sun { namespace star {
+namespace io { class XInputStream; }
+namespace lang { class XMultiServiceFactory; }
+} } }
+
+OUString GetNewFilledTempFile_Impl(
+css::uno::Reference const & xInStream,
+css::uno::Reference const & xFactory)
+throw (css::io::IOException, css::uno::RuntimeException);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/embeddedobj/source/msole/ownview.cxx
b/embeddedobj/source/msole/ownview.cxx
index 8f2657a..d1515e2 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -42,20 +42,14 @@
#include
#include
+#include "olepersist.hxx"
#include "ownview.hxx"
using namespace ::com::sun::star;
using namespace ::comphelper;
-OUString GetNewTempFileURL_Impl( const uno::Reference<
lang::XMultiServiceFactory >& xFactory ) throw( io::IOException );
-OUString GetNewFilledTempFile_Impl( const uno::Reference< io::XInputStream >&
xInStream, const uno::Reference< lang::XMultiServiceFactory >& xFactory )
throw( io::IOException );
sal_Bool KillFile_Impl( const OUString& aURL, const uno::Reference<
lang::XMultiServiceFactory >& xFactory );
-uno::Reference< io::XStream > TryToGetAcceptableFormat_Impl( const
uno::Reference< io::XStream >& xStream, const uno::Reference<
lang::XMultiServiceFactory >& xFactory ) throw ( uno::Exception );
-
-
-// Dummy interaction handler
-
class DummyHandler_Impl : public ::cppu::WeakImplHelper1<
task::XInteractionHandler >
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Reminder call for papers for LibreOffice conference in Bern
Hi all, This is a reminder that the call for papers is still open for our next conference in Bern in September. Find the original announcement here: http://blog.documentfoundation.org/2014/03/05/libreoffice-conference-2014-call-for-paper/ More information and material are also on the wiki: https://wiki.documentfoundation.org/Events/2014/LibreOffice_Annual_Conference Let us know if you have any question Kind regards Sophie ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dbaccess/source
dbaccess/source/core/api/RowSet.cxx|1 + dbaccess/source/ui/querydesign/querycontroller.cxx |1 + dbaccess/source/ui/uno/composerdialogs.cxx |1 + dbaccess/source/ui/uno/dbinteraction.cxx |1 + 4 files changed, 4 insertions(+) New commits: commit aea96244d1228a7b2de27c46f1d33b7025803667 Author: Stephan Bergmann Date: Mon Apr 14 10:54:34 2014 +0200 Missing includes Change-Id: I08750fdaab137665205a6e55891d845b39b0147d diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index b80f9f9..508489e 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -26,6 +26,7 @@ #include "RowSet.hxx" #include "dbastrings.hrc" #include "sdbcoretools.hxx" +#include "services.hxx" #include "SingleSelectQueryComposer.hxx" #include "module_dba.hxx" #include "CRowSetColumn.hxx" diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index eb8bafd..65a64ee 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -25,6 +25,7 @@ #include "defaultobjectnamecheck.hxx" #include "dlgsave.hxx" #include "localresaccess.hxx" +#include "uiservices.hxx" #include "QTableWindow.hxx" #include "QTableWindowData.hxx" #include "querycontainerwindow.hxx" diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 6d809c6..8b701c3 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -18,6 +18,7 @@ */ #include "composerdialogs.hxx" +#include "uiservices.hxx" #include "dbu_reghelper.hxx" #include diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index a693b6a..59f133f 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -19,6 +19,7 @@ #include "dbinteraction.hxx" #include "dbu_reghelper.hxx" +#include "uiservices.hxx" #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 14 --
1 file changed, 14 deletions(-)
New commits:
commit e052009df1c01958aa1371e0cb0c8da75f0881ba
Author: Stephan Bergmann
Date: Mon Apr 14 10:36:54 2014 +0200
Remove unused code
Change-Id: I9d407fcdbee66b44504c5d092d32113114e2ac46
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index c7badd1..1f1b1e3 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -211,9 +211,6 @@ public:
virtual TickInfo* firstInfo() SAL_OVERRIDE;
virtual TickInfo* nextInfo() SAL_OVERRIDE;
-private: //methods
-LabelIterator();
-
private: //member
PureTickIter m_aPureTickIter;
const AxisLabelStaggering m_eAxisLabelStaggering;
@@ -467,17 +464,6 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed(
const AxisLabelProperties&
return false;
}
-struct ComplexCategoryPlacement
-{
-OUString Text;
-sal_Int32 Count;
-double TickValue;
-
-ComplexCategoryPlacement( const OUString& rText, sal_Int32 nCount, double
fTickValue )
-: Text(rText), Count(nCount), TickValue(fTickValue)
-{}
-};
-
void VCartesianAxis::createAllTickInfosFromComplexCategories( ::std::vector<
::std::vector< TickInfo > >& rAllTickInfos, bool bShiftedPosition )
{
//no minor tickmarks will be generated!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/Library_ldapbe2.mk
extensions/Library_ldapbe2.mk |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit d2555ebb240fea2780f152e5ea39d145aab508fe Author: Stephan Bergmann Date: Mon Apr 14 09:57:50 2014 +0200 better? Change-Id: Idacacf531d237c2c7482db85c56b58954fd04ac5 diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 0224376..6547a23 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -35,8 +35,10 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ +$(eval $(call gb_Library_use_externals,ldapbe2,\ boost_headers \ +)) +$(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ wldap32 \ )) else # 0S!=WNT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - distro-configs/CPOSX.conf
distro-configs/CPOSX.conf |1 + 1 file changed, 1 insertion(+) New commits: commit 0218b6e907b08e4acf1831bfe054af3b23086872 Author: Andras Timar Date: Mon Apr 14 09:57:55 2014 +0200 --with-myspell-dicts for OS X Change-Id: I7caf826b001d08dd5329638d18685360dd9de027 diff --git a/distro-configs/CPOSX.conf b/distro-configs/CPOSX.conf index 48e634d..ee40ac8 100644 --- a/distro-configs/CPOSX.conf +++ b/distro-configs/CPOSX.conf @@ -3,6 +3,7 @@ --without-junit --with-help --with-helppack-integration +--with-myspell-dicts --enable-extension-integration --disable-online-update --disable-odk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: extensions/Library_ldapbe2.mk
extensions/Library_ldapbe2.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d0c4ab34fd16882cd93decbaa2f99d27642dce11 Author: Stephan Bergmann Date: Mon Apr 14 09:44:35 2014 +0200 Missing boost_headers dependency for WNT Change-Id: I92906de88669d629f8efd39439c4e6e0151f687c diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 0eb2699..0224376 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ ifeq ($(OS),WNT) $(eval $(call gb_Library_use_system_win32_libs,ldapbe2,\ + boost_headers \ wldap32 \ )) else # 0S!=WNT ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo77267.rtf | 12
sw/qa/extras/rtfimport/rtfimport.cxx |6 ++
writerfilter/source/rtftok/rtfdocumentimpl.cxx |3 +++
3 files changed, 21 insertions(+)
New commits:
commit 904630a2272ac4dd540939f8a462bff5d636f066
Author: Miklos Vajna
Date: Mon Apr 14 08:52:59 2014 +0200
fdo#77267 RTF import: pard should reset current paragraph style
Change-Id: I8d78ce262a4e57161325231a78e48750909b1bad
diff --git a/sw/qa/extras/rtfimport/data/fdo77267.rtf
b/sw/qa/extras/rtfimport/data/fdo77267.rtf
new file mode 100644
index 000..f9b9060
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo77267.rtf
@@ -0,0 +1,12 @@
+{\rtf1\ansi\ansicpg1250\uc1 \deff0\deflang1045\deflangfe1045
+{\stylesheet
+{
+\li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
\fs24\lang1045\langfe1045\cgrid\langnp1045\langfenp1045 \snext0 Normal;}
+{\s4\qc \li0\ri0\sl360\slmult1
+\keepn\nowidctlpar\faauto\outlinelevel3\rin0\lin0\itap0
\b\fs52\lang1045\langfe1045\cgrid\langnp1045\langfenp1045 \sbasedon0 \snext0
heading 4;}
+}
+\pard\plain \s4\qc
\li0\ri0\sl360\slmult1\keepn\nowidctlpar\faauto\outlinelevel3\rin0\lin0\itap0
+\pard \qc
+l
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 67f86bd..7ebd83e 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1648,6 +1648,12 @@ DECLARE_RTFIMPORT_TEST(testFdo74599, "fdo74599.rtf")
CPPUNIT_ASSERT_EQUAL(static_cast(-1),
getProperty(xPropertySet, "CharColor"));
}
+DECLARE_RTFIMPORT_TEST(testFdo77267, "fdo77267.rtf")
+{
+// Paragraph was aligned to left, should be center.
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER,
static_cast(getProperty(getParagraph(1),
"ParaAdjust")));
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b9b99fe..1a0fd1a 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2536,6 +2536,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_inTbl,
RTFValue::Pointer_t(new RTFValue(1)));
}
m_aStates.top().resetFrame();
+
+// Reset currently selected paragraph style as well.
+m_aStates.top().nCurrentStyleIndex = -1;
break;
case RTF_SECTD:
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source
filter/source/msfilter/msdffimp.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 2612f51f9373d869f714ae1269143a5c09f4608e
Author: LuboÅ¡ LuÅák
Date: Sun Apr 13 23:06:58 2014 +0200
handle .doc cropping also inside groups (fdo#38411)
Writer does handle cropping on its own, but only for "toplevel" images,
not for those inside groups, so there still use the generic code.
Change-Id: I805a4cbd2d4cea7008e0322688ccd7f35a6d4a2c
(cherry picked from commit af51f3fb5aee469423b154958ccb3fe61284122f)
Reviewed-on: https://gerrit.libreoffice.org/8950
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index c0db6dc..63847b3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -3744,8 +3744,9 @@ SdrObject* SvxMSDffManager::ImportGraphic( SvStream& rSt,
SfxItemSet& rSet, cons
}
if ( bGrfRead )
{
-// the writer is doing it's own cropping, so this part affects
only impress and calc
-if ( GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_CROP_BITMAPS )
+// the writer is doing its own cropping, so this part affects only
impress and calc,
+// unless we're inside a group, in which case writer doesn't crop
either
+if (( GetSvxMSDffSettings() & SVXMSDFF_SETTINGS_CROP_BITMAPS ) ||
rObjData.nCalledByGroup != 0 )
lcl_ApplyCropping( *this, ( rObjData.nSpFlags & SP_FOLESHAPE )
== 0 ? &rSet : NULL, aGraf );
if ( IsProperty( DFF_Prop_pictureTransparent ) )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
