[Libreoffice-commits] core.git: 3 commits - include/vcl sd/source solenv/gbuild sw/source toolkit/source vcl/Library_vcl.mk vcl/source vcl/unx
include/vcl/unohelp.hxx |1
sd/source/ui/dlg/sdabstdlg.cxx |4 -
solenv/gbuild/Helper.mk | 16 ++
solenv/gbuild/LinkTarget.mk | 52 +-
solenv/gbuild/gbuild.mk |2
solenv/gbuild/platform/com_GCC_class.mk | 75 ++--
solenv/gbuild/platform/com_GCC_defs.mk | 10
solenv/gbuild/platform/com_MSC_class.mk | 40 ++---
solenv/gbuild/platform/com_MSC_defs.mk | 10
solenv/gbuild/platform/macosx.mk|7 --
solenv/gbuild/platform/solaris.mk |9 +--
solenv/gbuild/platform/unxgcc.mk|7 --
sw/source/ui/dialog/swabstdlg.cxx |4 -
toolkit/source/awt/vclxtoolkit.cxx | 10 +---
vcl/Library_vcl.mk |8 ---
vcl/source/app/svapp.cxx| 10 +---
vcl/source/app/unohelp.cxx | 31 -
vcl/source/window/abstdlg.cxx |3 -
vcl/source/window/builder.cxx |2
vcl/unx/generic/plugadapt/salplug.cxx | 18 +++
20 files changed, 81 insertions(+), 238 deletions(-)
New commits:
commit c47496fdf9f0ec396f15fb9ddde6bd8d244a1797
Author: Matúš Kukan matus.ku...@collabora.com
Date: Mon Feb 24 16:51:31 2014 +0100
Add config_libraries.h definitions to get library names easily.
Works for libmerged too, so we can get rid of LIBO_MERGELIBS.
And remove few more #defines in vcl.
It's generated by gbuild, so probably abusing config_host directory.
Open to improvements.
Change-Id: I87ab109bf109e42751766011daf076e9cdf8f5ee
diff --git a/include/vcl/unohelp.hxx b/include/vcl/unohelp.hxx
index 3368856..c149692 100644
--- a/include/vcl/unohelp.hxx
+++ b/include/vcl/unohelp.hxx
@@ -52,7 +52,6 @@ namespace unohelper
{
VCL_DLLPUBLIC ::com::sun::star::uno::Reference
::com::sun::star::i18n::XBreakIterator CreateBreakIterator();
VCL_DLLPUBLIC ::com::sun::star::uno::Reference
::com::sun::star::i18n::XCharacterClassification
CreateCharacterClassification();
-VCL_DLLPUBLIC OUString CreateLibraryName( const sal_Char* pModName, bool bSUPD
);
VCL_DLLPUBLIC void NotifyAccessibleStateEventGlobally( const
::com::sun::star::accessibility::AccessibleEventObject rEventObject );
}} // namespace vcl::unohelper
diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx
index cc57f68..fc83a93 100644
--- a/sd/source/ui/dlg/sdabstdlg.cxx
+++ b/sd/source/ui/dlg/sdabstdlg.cxx
@@ -18,12 +18,12 @@
*/
#include config_features.h
+#include config_libraries.h
#include sdabstdlg.hxx
#include osl/module.hxx
#include rtl/ustring.hxx
-#include vcl/unohelp.hxx
typedef SdAbstractDialogFactory* (SAL_CALL *SdFuncPtrCreateDialogFactory)();
@@ -43,7 +43,7 @@ SdAbstractDialogFactory* SdAbstractDialogFactory::Create()
#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
-static const OUString sLibName(::vcl::unohelper::CreateLibraryName(sdui,
true));
+static const OUString sLibName(LIBO_LIBRARY(sdui));
if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( thisModule,
sLibName ) )
fp = ( SdAbstractDialogFactory* (SAL_CALL*)() )
aDialogLibrary.getFunctionSymbol( SdCreateDialogFactory );
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 93ff03e..a1a29f7 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -204,6 +204,15 @@ else mv $(1) $(2) $(if $(3), touch -r $(3) $(2)); \
fi
endef
+define gb_Helper_generate_config_libraries
+$(shell FILE=$(BUILDDIR)/config_$(gb_Side)/config_libraries.h \
+printf // This file is generated by gbuild:
gb_Helper_generate_config_libraries.\n\n $$FILE.tmp \
+$(foreach lib,$(gb_Library_KNOWNLIBS), \
+ printf #define LIBO_LIB_$(subst -,_,$(lib)) \$(call
gb_Library_get_runtime_filename,$(call gb_Library__get_name,$(lib)))\\n
$$FILE.tmp ) \
+printf \n#define LIBO_LIBRARY(name) LIBO_LIB_##name\n $$FILE.tmp \
+$(call gb_Helper_replace_if_different_and_touch,$$FILE.tmp,$$FILE))
+endef
+
define gb_Helper_define_if_set
$(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
endef
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 8c0f8b4..a864eb8 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -326,6 +326,8 @@ include $(foreach class, \
$(eval $(call gb_Helper_process_executable_registrations))
$(eval $(call gb_Postprocess_make_targets))
+$(eval $(call gb_Helper_generate_config_libraries))
+
# optional extensions that should never be essential
ifneq ($(wildcard $(GBUILDDIR)/extensions/post_*.mk),)
include $(wildcard $(GBUILDDIR)/extensions/post_*.mk)
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 986ef39..93d3fe7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -94,11 +94,6 @@ endif
Re: junit autogen error?
On 11/19/2013 09:11 AM, Stephan Bergmann wrote: The best fix probably is to use javac with -classpath junit.jar for the check. Fixed with http://cgit.freedesktop.org/libreoffice/core/commit/?id=ded6334f7016cb59dcb140a23339b1ca3418ca8c Make JUnit/Hamcrest detection more flexible now. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/platform/com_MSC_class.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d412b21695267df623d020e534c68a386d25431b Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Feb 25 18:07:47 2014 +0100 oops, missing `)' Change-Id: I1478ebf4abc60e8b8b18388a0e3ca12658bca2d9 diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 6a77d20..7683743 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -189,7 +189,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \ -dump -exports $(ILIBTARGET) \ $(WORKDIR)/LinkTarget/$(2).exports.tmp \ - $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1)) \ + $(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1))) \ ; exit $$RC) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 59e45c373fc037aa97432102067bdacc8fca6446
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 10:12:22 2014 +0100
warning C4510: default constructor could not be generated
Change-Id: Ia0dc23e5def53a6ede0d0d9f754e143347490b43
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 4695854..6414d04 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1146,8 +1146,8 @@ namespace
struct NameToId
{
-const OUString maName;
-const sal_Int32 maId;
+OUString maName;
+sal_Int32 maId;
};
const NameToId constNameToIdMapping[] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/FDO74105.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 15 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 13 +
writerfilter/source/dmapper/NumberingManager.cxx | 12
4 files changed, 36 insertions(+), 4 deletions(-)
New commits:
commit 01826dc12550e7a4204034f7876c593726525b54
Author: Pallavi Jadhav pallavi.jad...@synerzip.com
Date: Tue Jan 28 11:42:53 2014 +0530
fdo#74105 : Prservation of Numbered lists-Starting with Value '0'
Issue :
- DOCX containing Numbered lists- Strating with
value '0' is not preserved after RT.
- LO exports document with Numbered lists starting
from '1' instead of '0'.
- LO Import and Export need fixes.
- If LO will imports correctly, export will get
correct value.
Implentation :
- Added code at Import and Export side.
- Added Export Unit test case to check that
w:start is not present in numbering.xml
for 0th level.
NOTE : w:start is optional. If not mentioned
Numbered lists starts from '0'.
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/7710
Change-Id: I30910c41fd188f30a1723cf8e07be5ea1cde1be0
diff --git a/sw/qa/extras/ooxmlexport/data/FDO74105.docx
b/sw/qa/extras/ooxmlexport/data/FDO74105.docx
new file mode 100644
index 000..4299cf9
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/FDO74105.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d7692ac..7b7c904 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3498,6 +3498,21 @@ DECLARE_OOXMLEXPORT_TEST(testEmbeddedXlsx,
embedded-xlsx.docx)
CPPUNIT_ASSERT_EQUAL(2, nImageFiles);
}
+DECLARE_OOXMLEXPORT_TEST(testNumberedLists_StartingWithZero, FDO74105.docx)
+{
+/* Issue : Numbered lists Starting with value '0' is not preserved after
RT.
+ * In numbering.xml, an XML tag w:start is optional. If not mentioned,
+ * the Numbered list should start from 0.
+ * Problem was LO was writing w:start for all levels 0-8 with default
value 1.
+ */
+xmlDocPtr pXmlDoc = parseExport(word/numbering.xml);
+if (!pXmlDoc)
+ return;
+
+// Check that we do _not_ export w:start for w:lvl w:ilvl=0.
+assertXPath(pXmlDoc, w:numbering/w:abstractNum[1]/w:lvl[1]/w:start, 0);
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6414d04..77a0aed 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4434,10 +4434,15 @@ void DocxAttributeOutput::NumberingLevel( sal_uInt8
nLevel,
FSNS( XML_w, XML_ilvl ), OString::number( nLevel ).getStr(),
FSEND );
-// start with the nStart value
-m_pSerializer-singleElementNS( XML_w, XML_start,
-FSNS( XML_w, XML_val ), OString::number( nStart ).getStr(),
-FSEND );
+// start with the nStart value. Do not write w:start if Numbered Lists
+// starts from zero.As it's an optional parameter.
+// refer ECMA 376 Second edition Part-1
+if(!(0 == nLevel 0 == nStart))
+{
+m_pSerializer-singleElementNS( XML_w, XML_start,
+FSNS( XML_w, XML_val ), OString::number( nStart ).getStr(),
+FSEND );
+}
// format
OString aFmt( impl_NumberingType( nNumberingType ) );
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 60582c8..98d9c44 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -829,6 +829,7 @@ void ListsManager::lcl_attribute( Id nName, Value rVal )
void ListsManager::lcl_sprm( Sprm rSprm )
{
+static bool bIsStartVisited = false;
//fill the attributes of the style sheet
sal_uInt32 nSprmId = rSprm.getId();
if( m_pCurrentDefinition.get() ||
@@ -952,11 +953,22 @@ void ListsManager::lcl_sprm( Sprm rSprm )
}
break;
case NS_ooxml::LN_CT_Lvl_start:
+if (m_pCurrentDefinition-GetCurrentLevel().get())
+m_pCurrentDefinition-GetCurrentLevel( )-SetValue(
nSprmId, nIntValue );
+bIsStartVisited = true;
+break;
case NS_ooxml::LN_CT_Lvl_numFmt:
case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_ooxml::LN_CT_Lvl_legacy:
if (m_pCurrentDefinition-GetCurrentLevel().get())
+{
m_pCurrentDefinition-GetCurrentLevel( )-SetValue(
nSprmId,
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx| 17 +
compilerplugins/clang/pluginhandler.cxx | 11 ++-
2 files changed, 23 insertions(+), 5 deletions(-)
New commits:
commit 6f2774b209f0a52ad199f926cd56f581e73c79d5
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 10:15:28 2014 +0100
...but Flags parameter was plain unsigned int prior to Clang 3.4
Change-Id: Ife39abda6b5274ae196dcbf591d02fa3f36f6072
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 4bc9a6b..b09a221 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -10,12 +10,17 @@
#ifndef INCLUDED_COMPILERPLUGINS_CLANG_COMPAT_HXX
#define INCLUDED_COMPILERPLUGINS_CLANG_COMPAT_HXX
+#include memory
+#include string
+
#include clang/AST/Decl.h
#include clang/AST/Expr.h
#include clang/AST/Type.h
#include clang/Basic/Diagnostic.h
#include clang/Basic/DiagnosticIDs.h
#include llvm/ADT/StringRef.h
+#include llvm/Support/FileSystem.h
+#include llvm/Support/raw_ostream.h
// Compatibility wrapper to abstract over (trivial) changes in the Clang API:
namespace compat {
@@ -66,6 +71,18 @@ inline unsigned getCustomDiagID(
#endif
}
+inline std::unique_ptrllvm::raw_fd_ostream create_raw_fd_ostream(
+char const * Filename, std::string ErrorInfo)
+{
+#if (__clang_major__ == 3 __clang_minor__ = 5) || __clang_major__ 3
+return std::unique_ptrllvm::raw_fd_ostream(
+new llvm::raw_fd_ostream(Filename, ErrorInfo, llvm::sys::fs::F_None));
+#else
+return std::unique_ptrllvm::raw_fd_ostream(
+new llvm::raw_fd_ostream(Filename, ErrorInfo));
+#endif
+}
+
}
#endif
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 21d8990..361f12c 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -224,15 +224,16 @@ void PluginHandler::HandleTranslationUnit( ASTContext
context )
sprintf( filename, %s.new.%d, modifyFile.c_str(), getpid());
string error;
bool ok = false;
-raw_fd_ostream ostream( filename, error, sys::fs::F_None );
+std::unique_ptrraw_fd_ostream ostream(
+compat::create_raw_fd_ostream(filename, error) );
if( error.empty())
{
-it-second.write( ostream );
-ostream.close();
-if( !ostream.has_error() rename( filename, modifyFile.c_str())
== 0 )
+it-second.write( *ostream );
+ostream-close();
+if( !ostream-has_error() rename( filename, modifyFile.c_str())
== 0 )
ok = true;
}
-ostream.clear_error();
+ostream-clear_error();
unlink( filename );
if( !ok )
report( DiagnosticsEngine::Error, cannot write modified source to
%0 (%1) ) modifyFile error;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
QA Meeting Minutes - 2014-02-24
Hello, hello, Meeting minutes from the QA Meeting are here: https://wiki.documentfoundation.org/QA/Meetings/2014/February_24 The next QA Call will be: https://wiki.documentfoundation.org/QA/Meetings/2014/March_10 We may be rescheduling the time and weekday of QA Calls in the near future, so if you're interested in joining in, please keep an eye on the QA mailing list. Best, --R ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/compat.hxx| 18 +
compilerplugins/clang/store/salbool.cxx | 566
2 files changed, 584 insertions(+)
New commits:
commit cc478960dceea17858ba88067dc3ecf07a07d291
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 10:48:55 2014 +0100
salbool: a rewriting plugin that flags most uses of sal_Bool
...that would not lead to silent changes of the code. That is, it does not
warn
about sal_Bool parameters of virtual functions, so that (not yet rewritten)
overrides do not silently become overloads instead.
The plugin is in store/ for now, because not all of the code has been
cleaned up
yet.
Change-Id: I6e9b3847eb26c3090f375045188d38097052defe
diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index b09a221..fa89eba 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -14,6 +14,8 @@
#include string
#include clang/AST/Decl.h
+#include clang/AST/DeclBase.h
+#include clang/AST/DeclCXX.h
#include clang/AST/Expr.h
#include clang/AST/Type.h
#include clang/Basic/Diagnostic.h
@@ -25,6 +27,22 @@
// Compatibility wrapper to abstract over (trivial) changes in the Clang API:
namespace compat {
+inline bool isExternCContext(clang::DeclContext const ctxt) {
+#if (__clang_major__ == 3 __clang_minor__ = 4) || __clang_major__ 3
+return ctxt.isExternCContext();
+#else
+for (clang::DeclContext const * c = ctxt;
+ c-getDeclKind() != clang::Decl::TranslationUnit; c = c-getParent())
+{
+if (c-getDeclKind() == clang::Decl::LinkageSpec) {
+return llvm::castclang::LinkageSpecDecl(c)-getLanguage()
+== clang::LinkageSpecDecl::lang_c;
+}
+}
+return false;
+#endif
+}
+
inline clang::QualType getReturnType(clang::FunctionDecl const decl) {
#if (__clang_major__ == 3 __clang_minor__ = 5) || __clang_major__ 3
return decl.getReturnType();
diff --git a/compilerplugins/clang/store/salbool.cxx
b/compilerplugins/clang/store/salbool.cxx
new file mode 100644
index 000..9552227
--- /dev/null
+++ b/compilerplugins/clang/store/salbool.cxx
@@ -0,0 +1,566 @@
+/* -*- 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/.
+ */
+
+#include algorithm
+#include cassert
+#include set
+#include string
+
+#include clang/AST/Attr.h
+
+#include compat.hxx
+#include plugin.hxx
+
+namespace {
+
+bool isSalBool(QualType type) {
+TypedefType const * t = type-getAsTypedefType();
+return t != nullptr t-getDecl()-getNameAsString() == sal_Bool;
+}
+
+// It appears that, given a function declaration, there is no way to determine
+// the language linkage of the function's type, only of the function's name
+// (via FunctionDecl::isExternC); however, in a case like
+//
+// extern C { static void f(); }
+//
+// the function's name does not have C language linkage while the function's
+// type does (as clarified in C++11 [decl.link]); cf. http://clang-developers.
+// 42468.n3.nabble.com/Language-linkage-of-function-type-tt4037248.html
+// Language linkage of function type:
+bool hasCLanguageLinkageType(FunctionDecl const * decl) {
+assert(decl != nullptr);
+if (decl-isExternC()) {
+return true;
+}
+#if (__clang_major__ == 3 __clang_minor__ = 3) || __clang_major__ 3
+if (decl-isInExternCContext()) {
+return true;
+}
+#else
+if (decl-getCanonicalDecl()-getDeclContext()-isExternCContext()) {
+return true;
+}
+#endif
+return false;
+}
+
+bool canOverrideTemplateArgumentMember(CXXMethodDecl const * decl) {
+CXXRecordDecl const * r = dyn_castCXXRecordDecl(decl-getDeclContext());
+assert(r != nullptr);
+for (auto b = r-bases_begin(); b != r-bases_end(); ++b) {
+if (b-getType()-isTemplateTypeParmType()) {
+return true;
+}
+}
+return false;
+}
+
+//TODO: current implementation is not at all general, just tests what we
+// encounter in practice:
+bool hasBoolOverload(FunctionDecl const * decl) {
+if (isaCXXMethodDecl(decl)) {
+unsigned n = decl-getNumParams();
+CXXRecordDecl const * r = dyn_castCXXRecordDecl(
+decl-getDeclContext());
+assert(r != nullptr);
+for (auto m = r-method_begin(); m != r-method_end(); ++m) {
+if (m-getDeclName() == decl-getDeclName()
+ m-getNumParams() == n)
+{
+bool hasSB = false;
+for (unsigned i = 0; i != n; ++i) {
+QualType t1 { decl-getParamDecl(i)-getType() };
+bool isSB = isSalBool(t1);
+bool isSBRef =
[Libreoffice-commits] core.git: 2 commits - oox/source sc/source
oox/source/export/chartexport.cxx |2 +-
sc/source/filter/excel/xestream.cxx |3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 1efe2782de94f55faac510d8fd4596fc54ea1d37
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Feb 25 10:47:47 2014 +0100
fix OOXML validation error
Change-Id: Ia27f9615b063393a0733e061df7dd1666283badb
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index e565035..4250cb7 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -2553,6 +2553,7 @@ void ChartExport::exportDataLabels(
{
if (GetProperty( xPropSet, Label))
mAny = aTempLabel;
+}
@@ -2661,7 +2662,6 @@ void ChartExport::exportDataLabels(
pFS-endElement( FSNS( XML_c, XML_dLbls ) );
}
-}
}
void ChartExport::exportDataPoints(
commit b428fda3d353eb64d4af55277277c969d383db16
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Tue Feb 25 10:34:54 2014 +0100
don't access empty container, related fdo#33698
Change-Id: I6deb23c9f5cd1c60e2b478afd67a5196f45d3c43
diff --git a/sc/source/filter/excel/xestream.cxx
b/sc/source/filter/excel/xestream.cxx
index 30d774f..3dc697d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -757,6 +757,9 @@ OString XclXmlUtils::ToOString( const ScAddress rAddress )
OString XclXmlUtils::ToOString( const ScfUInt16Vec rBuffer )
{
+if(rBuffer.empty())
+return OString();
+
const sal_uInt16* pBuffer = rBuffer [0];
return OString( pBuffer, rBuffer.size(), RTL_TEXTENCODING_UTF8 );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/Makefile-clang.mk config_host.mk.in configure.ac
compilerplugins/Makefile-clang.mk |4 ++-- config_host.mk.in |1 - configure.ac |8 +--- 3 files changed, 3 insertions(+), 10 deletions(-) New commits: commit 95700a2d7d09893fe16aadb406e93bf7164f7422 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 10:55:26 2014 +0100 Drop CLANGBUILD in addition to CLANGDIR ...see http://lists.freedesktop.org/archives/libreoffice/2014-February/059654.html Drop CLANGBUILD in addition to CLANGDIR? Change-Id: I8d68aa0f2298240c8e7265cab273c602f5b6881a diff --git a/compilerplugins/Makefile-clang.mk b/compilerplugins/Makefile-clang.mk index 5d09346..2c57f40 100644 --- a/compilerplugins/Makefile-clang.mk +++ b/compilerplugins/Makefile-clang.mk @@ -21,7 +21,7 @@ CLANGCXXFLAGS=-O2 -Wall -Wextra -g # Clang headers require these. CLANGDEFS=-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -fno-rtti # All include locations needed. -CLANGINCLUDES=-isystem $(CLANGDIR)/include -isystem $(CLANGDIR)/tools/clang/include -isystem $(CLANGBUILD)/include -isystem $(CLANGBUILD)/tools/clang/include +CLANGINCLUDES=-isystem $(CLANGDIR)/include -isystem $(CLANGDIR)/tools/clang/include # Clang/LLVM libraries are intentionally not linked in, they are usually built as static libraries, which means the resulting # plugin would be big (even though the clang binary already includes it all) and it'd be necessary to explicitly specify @@ -93,7 +93,7 @@ $(CLANGOUTDIR)/plugin.so: $(CLANGOBJS) -Wl$(CLANG_COMMA)-undefined -Wl$(CLANG_COMMA)suppress) # Clang most probably doesn't maintain binary compatibility, so rebuild when clang changes. -$(CLANGOUTDIR)/clang-timestamp: $(CLANGBUILD)/bin/clang +$(CLANGOUTDIR)/clang-timestamp: $(CLANGDIR)/bin/clang $(QUIET)touch $@ # vim: set noet sw=4 ts=4: diff --git a/config_host.mk.in b/config_host.mk.in index 697d788..a9caf50 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -51,7 +51,6 @@ export CC=@CC@ export CDR_CFLAGS=$(gb_SPACE)@CDR_CFLAGS@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@ @x_CFLAGS@ export CFLAGS=@CFLAGS@ -export CLANGBUILD=@CLANGBUILD@ export CLANGDIR=@CLANGDIR@ export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@ export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@ diff --git a/configure.ac b/configure.ac index c400d23..c6da52b 100644 --- a/configure.ac +++ b/configure.ac @@ -5656,18 +5656,13 @@ if test $COM_GCC_IS_CLANG = TRUE; then if test -z $CLANGDIR; then CLANGDIR=/usr fi -dnl The build directory (different from CLANGDIR if using a Clang out- -dnl of-source build): -if test -z $CLANGBUILD; then -CLANGBUILD=/usr -fi AC_LANG_PUSH([C++]) save_CPPFLAGS=$CPPFLAGS save_CXX=$CXX # compiler plugins must be built with native bitness of clang # because they link against clang libraries CXX=`echo $CXX | sed -e s/-m64// -e s/-m32//` -CPPFLAGS=$CPPFLAGS -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -I$CLANGBUILD/include -I$CLANGBUILD/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS +CPPFLAGS=$CPPFLAGS -I$CLANGDIR/include -I$CLANGDIR/tools/clang/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h, [COMPILER_PLUGINS=TRUE], [ @@ -5689,7 +5684,6 @@ else fi AC_SUBST(COMPILER_PLUGINS) AC_SUBST(CLANGDIR) -AC_SUBST(CLANGBUILD) # Plugin to help linker. # Add something like LD_PLUGIN=/usr/lib64/LLVMgold.so to your autogen.input. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Drop CLANGBUILD in addition to CLANGDIR?
On 02/24/2014 01:53 PM, Stephan Bergmann wrote: That is, anybody any objections against committing the below patch to master? Committed as http://cgit.freedesktop.org/libreoffice/core/commit/?id=95700a2d7d09893fe16aadb406e93bf7164f7422 Drop CLANGBUILD in addition to CLANGDIR now. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sysui/desktop
sysui/desktop/productversion.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6a1f34766f40bf697b8bb56951c5b3a3267afd97 Author: Jürgen Schmidt j...@apache.org Date: Tue Feb 25 08:56:43 2014 + #124311# change version number diff --git a/sysui/desktop/productversion.mk b/sysui/desktop/productversion.mk index 33c7d7d..50c9ac8 100644 --- a/sysui/desktop/productversion.mk +++ b/sysui/desktop/productversion.mk @@ -47,7 +47,7 @@ PRODUCTLIST = openoffice # default values to minimize maintainance effort # CAUTION! $(OOOBASEVERSION) from openoffice.lst NOT available (!) -PRODUCTVERSION = 4.0 +PRODUCTVERSION = 4.1 # CAUTION! $(BRANDPACKAGEVERSION) from openoffice.lst NOT available (!) PRODUCTVERSIONSHORT = 4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Testing/Working on PyUNO?
I'm sorry to have ignited a discussion for which I wasn't looking. I clearly don't have the authority to weigh in given my (lack of) meritocratic wealth in the LibO community, so let me keep this simple: I'm truly just trying to find an agreeable avenue for hacking on LibO given my use cases and time. In the hopes that some of this discussion is fueled by a misunderstanding of my intentions, let me apologize below: At 11:19am -0500 Wed, 19 Feb 2014, Kohei Yoshida wrote: On Wed, 2014-02-19 at 16:51 +0100, Bjoern Michaelsen wrote: Its still better than a bug without a reproduction scenario. So consider a failed Python test a mere bug with a good reproduction scenario for now. But that's not what we are talking about here. Kevin insists to write Python test to test core functionality, which is already covered in core test. Gosh, I'm sorry that's how I came across. As I said over IRC, I recognize that I don't get it. I'm trying to. I patently do _not_ insist on anything in this area, as I recognize I'm not a maintainer, nor do I have the requisite internal knowledge of LibO/Calc. I am, however, trying to find a way to strengthen what I perceive to be an area of weakness for LibO, and one that has potential for my use cases. Namely, Python bindings to Calc. Perhaps there's no fit here right now, and that's okay, too. Clearly, were I to engage here, I'd like to not step on your (or anyone's) development toes. Cheers, Kevin ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Can XML been imported/transformed with API
Hallo,
In the past there was he "com.sun.star.comp.JAXTHelper" to
make a translation of a XML this stuff is now removed from LO
SaxtHelper is replaced by com.sun.star.comp.documentconversion.LibXSLTTransformer
In the past there was some code (below originated from the
Hanja Hermione website) to work with this JAXThelper i tried the
same code but now using com.sun.star.comp.documentconversion.LibXSLTTransformer
No errors but i end up with a empty "out.txt" file
can someone explain how to work with the new stuff or is it simply
not possible to make XML transformations using the API.
(the SaxParser is working but to slow for big files)
Greetz
And thanks for any advice
Fernand
Sub Main
bStarted = True
oSFA = CreateUnoService( _
"com.sun.star.ucb.SimpleFileAccess" )
oIn = oSFA.openFileRead("file:///C:/usr/content.xml")
oOut = oSFA.openFileWrite("file:///C:/usr/out.txt")
Dim aNamed(6) As New com.sun.star.beans.NamedValue
aNamed(0).Name = "StylesheetURL"
aNamed(0).Value = "file:///C:/yourXSLT.xsl"
aNamed(1).Name = "SourceURL"
aNamed(1).Value = "file:///C:/usr/yourcontent.xml"
aNamed(2).Name = "TargetURL"
aNamed(2).Value = "file:///C:/out.txt"
aNamed(3).Name = "SourceBaseURL"
aNamed(3).Value = "file:///C:/"
aNamed(4).Name = "TargetBaseURL"
aNamed(4).Value = "file:///C:/"
aNamed(5).Name = "SystemType"
aNamed(5).Value = ""
aNamed(6).Name = "PublicType"
aNamed(6).Value = ""
oStreamListener = CreateUnoListener( "Stream_", _
"com.sun.star.io.XStreamListener" )
oJAXHelper = CreateUnoService( _
"om.sun.star.comp.documentconversion.LibXSLTTransformer " )
oJAXHelper.initialize(aNamed)
oJAXHelper.addListener(oStreamListener)
oJAXHelper.setInputStream(oIn)
oJAXHelper.setOutputStream(oOut)
' start translation
oJAXHelper.start()
' needs to wait the end of translation
While bStarted
wait 100
WEnd
oJAXHelper.removeListener(oStreamListener)
oIn.closeInput()
oOut.closeOutput()
End Sub
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Minutes of ESC call
On 2014-02-21 16:21, Thorsten Behrens wrote: Jan Holesovsky wrote: * Problems in image scaling code (Markus) + can we use openmp there? anybody against? + gcc and visual studio both support that [Markus] + easy to use [Markus] Another piece to look at are intel's TBB, which in my mind are _much_ more idiomatic for c++ code. I'm always reminded of fortran when I see openmp code. ;) For vcl/source/gdi/* - that is clearly rife of inefficiencies funny algorithms. A plan back in the day was to replace code there with calls to basebmp stuff one by one, though somehow I never got to it. But it would be nice to have _one_ place for filtering image scaling, instead of three in vcl, one in each application, and one in basebmp. Wasn't there a plan at one point to make use of Cairo and/or Pixman for such things? I would have thought they'd have pretty efficient versions of stuff like that by now. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/InstallModule_gnome.mk scp2/InstallModule_impress.mk scp2/InstallModule_ooo.mk
scp2/InstallModule_gnome.mk |2 -- scp2/InstallModule_impress.mk |1 - scp2/InstallModule_ooo.mk | 10 -- 3 files changed, 13 deletions(-) New commits: commit 513a947a9289290e520e31461f46ec7276be9417 Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Feb 25 11:09:55 2014 +0100 scp2: These defines are not used in the sources. Change-Id: Ie586fd383af33cb8dcb00b2d8f9ae41f39a1a673 diff --git a/scp2/InstallModule_gnome.mk b/scp2/InstallModule_gnome.mk index 02a89cd..3e2fa77 100644 --- a/scp2/InstallModule_gnome.mk +++ b/scp2/InstallModule_gnome.mk @@ -15,9 +15,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\ ENABLE_GIO \ ENABLE_GNOMEVFS \ ENABLE_LOCKDOWN \ -ENABLE_EVOAB2 \ ENABLE_GTK \ -ENABLE_GTK3 \ )) $(eval $(call gb_InstallModule_add_scpfiles,scp2/gnome,\ diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index d57dc3f..eb1d084 100644 --- a/scp2/InstallModule_impress.mk +++ b/scp2/InstallModule_impress.mk @@ -14,7 +14,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress)) $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ ENABLE_MACOSX_SANDBOX \ - ENABLE_OPENGL \ )) $(eval $(call gb_InstallModule_add_templates,scp2/impress,\ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index af0a262..68ae1aa 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -21,16 +21,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ )) $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ - DISABLE_ATL \ - DISABLE_NEON \ - ENABLE_CAIRO_CANVAS \ - ENABLE_DIRECTX \ - ENABLE_EVOAB2 \ ENABLE_GTK \ - ENABLE_GTK3 \ - ENABLE_KAB \ ENABLE_KDE \ - ENABLE_KDE4 \ ENABLE_LIBLANGTAG \ ENABLE_LPSOLVE \ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ @@ -38,9 +30,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_NPAPI_FROM_BROWSER \ ENABLE_NPAPI_INTO_BROWSER \ ENABLE_ONLINE_UPDATE \ - ENABLE_OPENGL \ ENABLE_TDE \ - ENABLE_TDEAB \ SYSTEM_APACHE_COMMONS \ SYSTEM_BOOST \ SYSTEM_CAIRO \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Notes on compilerplugins/clang/store/salbool.cxx
...introduced with http://cgit.freedesktop.org/libreoffice/core/commit/?id=cc478960dceea17858ba88067dc3ecf07a07d291 salbool: a rewriting plugin that flags most uses of sal_Bool. If you want to use it to clean up uses of sal_Bool in some module M: After a full build, do make $M.clean cp compilerplugins/clang/store/salbool.cxx compilerplugins/clang/ make -k $M make -k PARALLELISM=1 COMPILER_PLUGIN_TOOL='literaltoboolconversion salbool' UPDATE_FILES=$M $M make -k $M make -k PARALLELISM=1 COMPILER_PLUGIN_TOOL='literaltoboolconversion salbool' UPDATE_FILES=$M $M ... rm compilerplugins/clang/salbool.cxx make -k check make -k COMPILER_PLUGIN_TOOL=literaltoboolconversion check make -k check make -k COMPILER_PLUGIN_TOOL=literaltoboolconversion check ... i.e., first use enough iterations of running the salbool rewriter over module M to get that module cleaned up. Also use the literaltoboolconversion rewriter in those runs, to automatically fix cases like salbool rewrote sal_Bool b = sal_False; to bool b = sal_False; which literatltoboolconversion on the next run rewrites to bool b = false; Use UPDATE_FILES=$M to also do the rewriting in the include files of module M (requires PARALLELISM=1). Interleave with non-rewriting make -k $M runs, to generate .o files for those .cxx files that have no more errors (as rewriting runs don't generate .o files, so would needlessly re-process those .cxx files again and again). Once the module itself is clean, disable the salbool plugin again and clean up any problems introduced into dependent modules (like a virtual function override derived from module M needs to change its return type from sal_Bool to bool). Some errors cannot be rewritten, so you need to fix those manually between runs. But note that salbool will rewrite a function declaration in an include file only when working on a .cxx file where it also sees a definition (to avoid some needless temporary compilation errors that prevent the rewriter from doing its work), and will otherwise flag the function declaration in the include file as a warning/error, so don't fix such a case manually but wait for a (subsequent) run to get to the corresponding .cxx and rewrite the include file automatically. Modules up to toolkit have already been processed. (See make dump-deps-sort for a rough estimate of up to.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Paris Hackfest in June
Hello, We should have a Hackfest in Paris during the month of June, ideally the 27th and 28th. It would take place at the Simplon space, located in Montreuil: www.simplon.co Please let me know in private or elsewhere if you would be interested in joining. Best, Charles. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa xmloff/source
sw/qa/extras/odfexport/data/shape-relsize.odt |binary
sw/qa/extras/odfexport/odfexport.cxx |8
xmloff/source/draw/ximpshap.cxx | 26 ++
xmloff/source/draw/ximpshap.hxx |2 ++
4 files changed, 36 insertions(+)
New commits:
commit 4da81e4a0bda96c3d25aa22341f94b58e584cefb
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Feb 25 11:47:32 2014 +0100
xmloff: import style:rel-width/height for drawinglayer shapes
In case the underlying UNO object supports that, which is the case for
Writer. Export was already working before.
Change-Id: I4676c8349ebe1959da004d6e1a024a342da45049
diff --git a/sw/qa/extras/odfexport/data/shape-relsize.odt
b/sw/qa/extras/odfexport/data/shape-relsize.odt
new file mode 100755
index 000..05a3ffa
Binary files /dev/null and b/sw/qa/extras/odfexport/data/shape-relsize.odt
differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index db75204..3d2450f 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -350,6 +350,14 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust,
textframe-vertadjust.odt)
xFrame.set(getTextFrameByName(Rectangle 3), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM,
getPropertydrawing::TextVerticalAdjust(xFrame, TextVerticalAdjust));
}
+
+DECLARE_ODFEXPORT_TEST(testShapeRelsize, shape-relsize.odt)
+{
+// These were all 0, as style:rel-width/height was ignored on import for
shapes.
+CPPUNIT_ASSERT_EQUAL(sal_Int16(40), getPropertysal_Int16(getShape(1),
RelativeWidth));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getPropertysal_Int16(getShape(1),
RelativeHeight));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index d9c95a0..8ba56a3 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -151,6 +151,8 @@ SdXMLShapeContext::SdXMLShapeContext(
, mbIsUserTransformed(sal_False)
, mnZOrder(-1)
, maSize(1, 1)
+, mnRelWidth(0)
+, mnRelHeight(0)
, maPosition(0, 0)
, maUsedTransformation()
, mbVisible(true)
@@ -454,6 +456,16 @@ void SdXMLShapeContext::AddShape(uno::Reference
drawing::XShape xShape)
xImp-shapeWithZIndexAdded( xShape, mnZOrder );
}
+if (mnRelWidth || mnRelHeight)
+{
+uno::Referencebeans::XPropertySet xPropertySet(xShape,
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySetInfo xPropertySetInfo =
xPropertySet-getPropertySetInfo();
+if (mnRelWidth
xPropertySetInfo-hasPropertyByName(RelativeWidth))
+xPropertySet-setPropertyValue(RelativeWidth,
uno::makeAny(mnRelWidth));
+if (mnRelHeight
xPropertySetInfo-hasPropertyByName(RelativeHeight))
+xPropertySet-setPropertyValue(RelativeHeight,
uno::makeAny(mnRelHeight));
+}
+
if( !maShapeId.isEmpty() )
{
uno::Reference uno::XInterface xRef(
static_castuno::XInterface *(xShape.get()) );
@@ -888,6 +900,20 @@ void SdXMLShapeContext::processAttribute( sal_uInt16
nPrefix, const OUString rL
maShapeDescription = rValue;
}
}
+else if (nPrefix == XML_NAMESPACE_STYLE)
+{
+sal_Int32 nTmp;
+if (IsXMLToken(rLocalName, XML_REL_WIDTH))
+{
+if (sax::Converter::convertPercent(nTmp, rValue))
+mnRelWidth = static_castsal_Int16(nTmp);
+}
+else if (IsXMLToken(rLocalName, XML_REL_HEIGHT))
+{
+if (sax::Converter::convertPercent(nTmp, rValue))
+mnRelHeight = static_castsal_Int16(nTmp);
+}
+}
else if( (XML_NAMESPACE_NONE == nPrefix) || (XML_NAMESPACE_XML == nPrefix)
)
{
if( IsXMLToken( rLocalName, XML_ID ) )
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index a4b8786..6ddb83b 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -73,6 +73,8 @@ protected:
SdXMLImExTransform2DmnTransform;
com::sun::star::awt::Size maSize;
+sal_Int16 mnRelWidth;
+sal_Int16 mnRelHeight;
com::sun::star::awt::Point maPosition;
basegfx::B2DHomMatrix maUsedTransformation;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit aaf1e86408758ff332bb071e329187b7369be1b2
Author: Tomaž Vajngerl tomaz.vajng...@collabora.com
Date: Tue Feb 25 12:30:26 2014 +0100
fix test merge screw-up
Change-Id: Id09d609c97872f7578b33e981d397fcdf7241e1b
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index fa22b44..324838e 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3570,6 +3570,7 @@
DECLARE_OOXMLEXPORT_TEST(testNumberedLists_StartingWithZero, FDO74105.docx)
// Check that we do _not_ export w:start for w:lvl w:ilvl=0.
assertXPath(pXmlDoc, w:numbering/w:abstractNum[1]/w:lvl[1]/w:start, 0);
+}
DECLARE_OOXMLEXPORT_TEST(testW14TextEffects_TextOutline,
TextEffects_TextOutline.docx)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa sw/source xmloff/source
sw/qa/extras/odfexport/odfexport.cxx | 10 --
sw/source/core/unocore/unodraw.cxx |4
xmloff/source/text/txtprmap.cxx |4
3 files changed, 16 insertions(+), 2 deletions(-)
New commits:
commit d618ea6b86711470b7f5ace94b95f15a4ba87325
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Feb 25 12:26:19 2014 +0100
xmloff: import/export loext:rel-width/height-rel for Writer shapes
Change-Id: Ie6e4367a235038479287530bd08b0a89c6bb498b
diff --git a/sw/qa/extras/odfexport/odfexport.cxx
b/sw/qa/extras/odfexport/odfexport.cxx
index 3d2450f..e6aaa40 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -353,9 +353,15 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust,
textframe-vertadjust.odt)
DECLARE_ODFEXPORT_TEST(testShapeRelsize, shape-relsize.odt)
{
+uno::Referencedrawing::XShape xShape = getShape(1);
// These were all 0, as style:rel-width/height was ignored on import for
shapes.
-CPPUNIT_ASSERT_EQUAL(sal_Int16(40), getPropertysal_Int16(getShape(1),
RelativeWidth));
-CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getPropertysal_Int16(getShape(1),
RelativeHeight));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(40), getPropertysal_Int16(xShape,
RelativeWidth));
+CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getPropertysal_Int16(xShape,
RelativeHeight));
+
+// Relation was page for both width and height, should be paragraph
for width.
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::FRAME,
getPropertysal_Int16(xShape, RelativeWidthRelation));
+// And make sure that height stays page.
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, RelativeHeightRelation));
}
#endif
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index a9377da..d3f53e6 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1797,6 +1797,10 @@ uno::Sequence beans::PropertyState
SwXShape::getPropertyStates(
pRet[nProperty] = beans::PropertyState_DIRECT_VALUE;
else if(bGroupMember)
pRet[nProperty] = beans::PropertyState_DEFAULT_VALUE;
+else if (pEntry-nWID == RES_FRM_SIZE
+ (pEntry-nMemberId == MID_FRMSIZE_REL_HEIGHT_RELATION
||
+ pEntry-nMemberId == MID_FRMSIZE_REL_WIDTH_RELATION))
+pRet[nProperty] = beans::PropertyState_DIRECT_VALUE;
else if(pFmt)
{
const SwAttrSet rSet = pFmt-GetAttrSet();
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 90cb26e..b96a433 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -829,6 +829,10 @@ XMLPropertyMapEntry aXMLShapePropMap[] =
// RES_FOLLOW_TEXT_FLOW (#i26791#)
MG_ED( IsFollowingTextFlow, STYLE, FLOW_WITH_TEXT, XML_TYPE_BOOL, 0
),
+// RES_FRM_SIZE
+MAP_EXT(RelativeWidthRelation, XML_NAMESPACE_LO_EXT, XML_REL_WIDTH_REL,
XML_TYPE_TEXT_HORIZONTAL_REL|XML_TYPE_PROP_GRAPHIC, CTF_RELWIDTHREL),
+MAP_EXT(RelativeHeightRelation, XML_NAMESPACE_LO_EXT,
XML_REL_HEIGHT_REL, XML_TYPE_TEXT_VERTICAL_REL|XML_TYPE_PROP_GRAPHIC,
CTF_RELHEIGHTREL),
+
M_END()
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svtools svtools/source
include/svtools/brwbox.hxx|6 +-
svtools/source/brwbox/brwbox1.cxx |8
svtools/source/brwbox/brwbox2.cxx |4 ++--
3 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit ee120240f7021ce8f06c09fe2c2b26593c7de67e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 12:44:37 2014 +0100
BrowseBox::bHideCursor misuses sal_Bool for TriState
(TRISTATE_INDET == smart is probably obvious enough to not warrant an
extra
enum.)
Change-Id: I5fde5294c83c9f805d9df645089665b9dbcfec96
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 8d172df..4581337 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -210,10 +210,6 @@ class SVT_DLLPUBLIC BrowseBox
,public DropTargetHelper
,public svt::IAccessibleTableProvider
{
-#define NO_CURSOR_HIDE 0
-#define HARD_CURSOR_HIDE1
-#define SMART_CURSOR_HIDE 2
-
friend class BrowserDataWin;
friend class ::svt::BrowseBoxImpl;
@@ -268,7 +264,7 @@ private:
sal_BoolbNotToggleSel; // set while in ToggleSelection() etc.
sal_BoolbHasFocus; // set/unset in Get/LoseFocus
sal_BoolbHideSelect;// hide selection (highlight)
-sal_BoolbHideCursor;// hide cursor (frame)
+TriStatebHideCursor;// hide cursor (frame)
Range aSelRange; // for selection expansion
BrowserColumns* pCols; // array of column-descriptions
diff --git a/svtools/source/brwbox/brwbox1.cxx
b/svtools/source/brwbox/brwbox1.cxx
index be9ad5d..55a0f77 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -96,7 +96,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
bHit = sal_False;
mbInteractiveRowHeight = sal_False;
bHideSelect = sal_False;
-bHideCursor = NO_CURSOR_HIDE;
+bHideCursor = TRISTATE_FALSE;
nRowCount = 0;
m_bFocusOnlyCursor = sal_True;
m_aCursorColor = COL_TRANSPARENT;
@@ -2291,15 +2291,15 @@ void BrowseBox::SetMode( BrowserMode nMode )
bHideSelect = ((nMode BROWSER_HIDESELECT) == BROWSER_HIDESELECT);
// default: do not hide the cursor at all (untaken scrolling and such)
-bHideCursor = NO_CURSOR_HIDE;
+bHideCursor = TRISTATE_FALSE;
if ( BROWSER_SMART_HIDECURSOR == ( nMode BROWSER_SMART_HIDECURSOR ) )
{ // smart cursor hide overrules hard cursor hide
-bHideCursor = SMART_CURSOR_HIDE;
+bHideCursor = TRISTATE_INDET;
}
else if ( BROWSER_HIDECURSOR == ( nMode BROWSER_HIDECURSOR ) )
{
-bHideCursor = HARD_CURSOR_HIDE;
+bHideCursor = TRISTATE_TRUE;
}
m_bFocusOnlyCursor = ((nMode BROWSER_CURSOR_WO_FOCUS) == 0);
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index fb39186..7bc82fc 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -383,12 +383,12 @@ void BrowseBox::ToggleSelection( sal_Bool bForce )
void BrowseBox::DrawCursor()
{
bool bReallyHide = false;
-if ( SMART_CURSOR_HIDE == bHideCursor )
+if ( bHideCursor == TRISTATE_INDET )
{
if ( !GetSelectRowCount() !GetSelectColumnCount() )
bReallyHide = true;
}
-else if ( HARD_CURSOR_HIDE == bHideCursor )
+else if ( bHideCursor == TRISTATE_TRUE )
{
bReallyHide = true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 6a/1f34766f40bf697b8bb56951c5b3a3267afd97
6a/1f34766f40bf697b8bb56951c5b3a3267afd97 |1 + 1 file changed, 1 insertion(+) New commits: commit f31790ec792e773597f8b4e24dcf9c133aabb533 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 25 11:48:03 2014 + Notes added by 'git notes add' diff --git a/6a/1f34766f40bf697b8bb56951c5b3a3267afd97 b/6a/1f34766f40bf697b8bb56951c5b3a3267afd97 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/6a/1f34766f40bf697b8bb56951c5b3a3267afd97 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fix for a crash test?
Hi Julien,
On Sat, Feb 22, 2014 at 07:05:39AM -0800, julien2412 serval2...@yahoo.fr
wrote:
On pc Debian x86-64 with master sources updated yesterday, I reproduced the
crash fdo51430-1.doc.
The bt shows a failing assert because of the line 2423 of this block:
2415 else
2416 {
2417 //What I do here, is that I examine the attributes, and
if
2418 //I find out, that it's CJK/CTL, then I set the
paragraph space
2419 //to the value set in
HTML_CJK_PARSPACE/HTML_CTL_PARSPACE.
2420
2421 sal_Bool bIsCJK = false;
2422 sal_Bool bIsCTL = false;
2423 SwpHints rHints = pTxtNode-GetSwpHints(); HERE
2424 sal_uInt16 nWhich;
2425 SwTxtAttr *pHt;
(see
http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/swhtml.cxx#2415)
If I check pTxtNode-HasHints() on SwHTMLParser::AddParSpace in
sw/source/filter/html/swhtml.cxx, no crash. But as often, I wonder if it's
the good fix or if I just hide a bug
In general, GetSwpHints() should only be used after a HasHints() call.
In an import filter, once again in general you are supposed to handle
all kind of strange user input. Based on that, I would just add the
HasHints() check there, unless you want to spend time on checking if the
bugdoc crashed in older versions as well (and if it did not, why that
didn't happen).
Miklos
signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - writerfilter/source
writerfilter/source/rtftok/rtfsdrimport.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 154a3ef1f5938c78a7ef1201d9cbae0240eb1cb0
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Feb 22 15:53:13 2014 +0100
Fix a crash from crashtest
4 0x2ad1b3ab in rtl_uString_newFromSubString
(ppThis=0x7ffeba48, pFrom=0x2ad4236c aImplEmpty_rtl_uString,
beginIndex=1, count=-2)
at /home/julien/compile-libreoffice/libo/sal/rtl/strtmpl.cxx:1231
5 0x2aaaec13e2b1 in rtl::OUString::copy (this=0x7ffebed0,
beginIndex=1, count=-2) at
/home/julien/compile-libreoffice/libo/include/rtl/ustring.hxx:1483
6 0x2aaaec1717e3 in writerfilter::rtftok::RTFSdrImport::resolve
(this=0x1aa4710, rShape=..., bClose=true)
at
/home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtfsdrimport.cxx:356
7 0x2aaaec134dfb in writerfilter::rtftok::RTFDocumentImpl::popState
(this=0x20508a0)
at
/home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx:4100
8 0x2aaaec18327f in writerfilter::rtftok::RTFTokenizer::resolveParse
(this=0x1aa46c0)
at
/home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtftokenizer.cxx:106
9 0x2aaaec11b269 in writerfilter::rtftok::RTFDocumentImpl::resolve
(this=0x20508a0, rMapper=...)
at
/home/julien/compile-libreoffice/libo/writerfilter/source/rtftok/rtfdocumentimpl.cxx:644
10 0x2aaaec297aa6 in RtfFilter::filter (this=0x1b658b0,
aDescriptor=uno::Sequence of length 13 = {...})
at
/home/julien/compile-libreoffice/libo/writerfilter/source/filter/RtfFilter.cxx:122
Here are some debug:
8;5;(0,0);(0,13);(1694,13);(1694,0);(0,0);
aToken (0,0)
aToken (0,13)
aToken (1694,13)
aToken (1694,0)
aToken (0,0)
aToken
So must test that aToken is not empty
Change-Id: Ib5f0af3306a983c8531a5db732831d4d786ce9f5
Reviewed-on: https://gerrit.libreoffice.org/8173
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index c13e104..8cbdc1b 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -350,7 +350,7 @@ void RTFSdrImport::resolve(RTFShape rShape, bool bClose)
nCount = aToken.toInt32();
aCoordinates.realloc(nCount);
}
-else
+else if (aToken.getLength())
{
// The coordinates are in an (x,y) form.
aToken = aToken.copy(1, aToken.getLength() - 2);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 19/0444f7fd3fa9cfcd1955b3f5dcd916184d02f4
19/0444f7fd3fa9cfcd1955b3f5dcd916184d02f4 |1 + 1 file changed, 1 insertion(+) New commits: commit db2a6e6cb93d6e35b60a737952a5a86fe2862baf Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 25 12:25:16 2014 + Notes added by 'git notes add' diff --git a/19/0444f7fd3fa9cfcd1955b3f5dcd916184d02f4 b/19/0444f7fd3fa9cfcd1955b3f5dcd916184d02f4 new file mode 100644 index 000..5234dc0 --- /dev/null +++ b/19/0444f7fd3fa9cfcd1955b3f5dcd916184d02f4 @@ -0,0 +1 @@ +merged as: b071ce32befcc84a57a7ecd39667cb6658c0c866 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - oox/source sfx2/source
oox/source/core/xmlfilterbase.cxx | 13 +
sfx2/source/doc/doctemplates.cxx |4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
New commits:
commit b071ce32befcc84a57a7ecd39667cb6658c0c866
Author: Armin Le Grand a...@apache.org
Date: Mon Feb 24 20:25:26 2014 +
Resolves: #i118640# force early destruction of last FragmentHandler...
to not let it use an already destroyed RelationsMap instance
(cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4)
Conflicts:
oox/source/core/xmlfilterbase.cxx
Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index fdee37b..29221c1 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -163,6 +163,7 @@ struct XmlFilterBaseImpl
TextFieldStack maTextFieldStack;
explicitXmlFilterBaseImpl( const Reference XComponentContext
rxContext ) throw( RuntimeException );
+~XmlFilterBaseImpl();
};
XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference XComponentContext
rxContext ) throw( RuntimeException ) :
@@ -174,6 +175,10 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference
XComponentContext rxCo
registerNamespaces(maFastParser);
}
+XmlFilterBaseImpl::~XmlFilterBaseImpl()
+{
+}
+
XmlFilterBase::XmlFilterBase( const Reference XComponentContext rxContext
) throw( RuntimeException ) :
FilterBase( rxContext ),
mxImpl( new XmlFilterBaseImpl( rxContext ) ),
@@ -184,6 +189,14 @@ XmlFilterBase::XmlFilterBase( const Reference
XComponentContext rxContext )
XmlFilterBase::~XmlFilterBase()
{
+// #i118640# Reset the DocumentHandler at the FastSaxParser manually; this
is
+// needed since the mechanism is that instances of FragmentHandler execute
+// their stuff (creating objects, setting attributes, ...) on being
destroyed.
+// They get destroyed by setting a new DocumentHandler. This also happens
in
+// the following implicit destruction chain of ~XmlFilterBaseImpl, but in
that
+// case it's member RelationsMap maRelationsMap will be destroyed, but
maybe
+// still be used by ~FragmentHandler - crash.
+mxImpl-maFastParser.setDocumentHandler( 0 );
}
commit 5eb95b2623a647134d4974c7977eb2340b3d84d7
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 25 11:47:28 2014 +
writeble-writable
Change-Id: If1617d6cbdafa989fa3134842dd2238d06a1d06e
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 47b8fed..cea14a6 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -1566,7 +1566,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const
OUString rGroupName )
if ( !maTemplateDirs.getLength() )
return sal_False;
-// check that the fs location is in writeble folder and this is not a
My templates folder
+// check that the fs location is in writable folder and this is not a
My templates folder
INetURLObject aGroupParentFolder( aGroupTargetURL );
if (!aGroupParentFolder.removeSegment())
return sal_False;
@@ -1683,7 +1683,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const
OUString rOldName,
if ( !maTemplateDirs.getLength() )
return sal_False;
-// check that the fs location is in writeble folder and this is not a My
templates folder
+// check that the fs location is in writable folder and this is not a My
templates folder
INetURLObject aGroupParentFolder( aGroupTargetURL );
if (!aGroupParentFolder.removeSegment() ||
isInternalTemplateDir(aGroupParentFolder.GetMainURL(INetURLObject::NO_DECODE)))
___
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' - oox/source
oox/source/core/xmlfilterbase.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit b88cb7b4f23dcd02177e6e3578e3b3ba14454c1c
Author: Armin Le Grand a...@apache.org
Date: Mon Feb 24 20:25:26 2014 +
Resolves: #i118640# force early destruction of last FragmentHandler...
to not let it use an already destroyed RelationsMap instance
(cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4)
Conflicts:
oox/source/core/xmlfilterbase.cxx
Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
(cherry picked from commit b071ce32befcc84a57a7ecd39667cb6658c0c866)
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index fe2055e..fe222d9 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -104,6 +104,7 @@ struct XmlFilterBaseImpl
TextFieldStack maTextFieldStack;
explicitXmlFilterBaseImpl( const Reference XComponentContext
rxContext ) throw( RuntimeException );
+~XmlFilterBaseImpl();
};
//
@@ -188,6 +189,10 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference
XComponentContext rxCo
maFastParser.registerNamespace( ids[i].Second );
}
+XmlFilterBaseImpl::~XmlFilterBaseImpl()
+{
+}
+
XmlFilterBase::XmlFilterBase( const Reference XComponentContext rxContext
) throw( RuntimeException ) :
FilterBase( rxContext ),
mxImpl( new XmlFilterBaseImpl( rxContext ) ),
@@ -198,6 +203,14 @@ XmlFilterBase::XmlFilterBase( const Reference
XComponentContext rxContext )
XmlFilterBase::~XmlFilterBase()
{
+// #i118640# Reset the DocumentHandler at the FastSaxParser manually; this
is
+// needed since the mechanism is that instances of FragmentHandler execute
+// their stuff (creating objects, setting attributes, ...) on being
destroyed.
+// They get destroyed by setting a new DocumentHandler. This also happens
in
+// the following implicit destruction chain of ~XmlFilterBaseImpl, but in
that
+// case it's member RelationsMap maRelationsMap will be destroyed, but
maybe
+// still be used by ~FragmentHandler - crash.
+mxImpl-maFastParser.setDocumentHandler( 0 );
}
//
___
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' - oox/source
oox/source/core/xmlfilterbase.cxx | 13 +
1 file changed, 13 insertions(+)
New commits:
commit e1187562c15594447766828ac89098fc8c964ef7
Author: Armin Le Grand a...@apache.org
Date: Mon Feb 24 20:25:26 2014 +
Resolves: #i118640# force early destruction of last FragmentHandler...
to not let it use an already destroyed RelationsMap instance
(cherry picked from commit 190444f7fd3fa9cfcd1955b3f5dcd916184d02f4)
Conflicts:
oox/source/core/xmlfilterbase.cxx
Change-Id: Ibd09ff9fcba8f919df0704c8e3a64423518b932f
(cherry picked from commit b071ce32befcc84a57a7ecd39667cb6658c0c866)
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 2ef319e..c0a016d 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -165,6 +165,7 @@ struct XmlFilterBaseImpl
TextFieldStack maTextFieldStack;
explicitXmlFilterBaseImpl( const Reference XComponentContext
rxContext ) throw( RuntimeException );
+~XmlFilterBaseImpl();
};
@@ -177,6 +178,10 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference
XComponentContext rxCo
registerNamespaces(maFastParser);
}
+XmlFilterBaseImpl::~XmlFilterBaseImpl()
+{
+}
+
XmlFilterBase::XmlFilterBase( const Reference XComponentContext rxContext
) throw( RuntimeException ) :
FilterBase( rxContext ),
mxImpl( new XmlFilterBaseImpl( rxContext ) ),
@@ -187,6 +192,14 @@ XmlFilterBase::XmlFilterBase( const Reference
XComponentContext rxContext )
XmlFilterBase::~XmlFilterBase()
{
+// #i118640# Reset the DocumentHandler at the FastSaxParser manually; this
is
+// needed since the mechanism is that instances of FragmentHandler execute
+// their stuff (creating objects, setting attributes, ...) on being
destroyed.
+// They get destroyed by setting a new DocumentHandler. This also happens
in
+// the following implicit destruction chain of ~XmlFilterBaseImpl, but in
that
+// case it's member RelationsMap maRelationsMap will be destroyed, but
maybe
+// still be used by ~FragmentHandler - crash.
+mxImpl-maFastParser.setDocumentHandler( 0 );
}
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: desktop/source
desktop/source/deployment/misc/dp_misc.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 1974b1601c0500e0db56f6cfd9db6bd25dcccfab
Author: Tor Lillqvist t...@collabora.com
Date: Tue Feb 25 15:00:38 2014 +0200
The LO process is called just soffice on OS X
Change-Id: I74a6af7f4dc49ccf8ff3ead0d5b3e5e9b78b4f7a
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index e92d2b3..d895af8 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -62,7 +62,11 @@ using namespace ::com::sun::star::uno;
#define SWRITER swriter.exe
#endif
+#ifdef MACOSX
+#define SOFFICE2 soffice
+#else
#define SOFFICE2 soffice.bin
+#endif
namespace dp_misc {
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/rhbz1065629.rtf| 20 +
sw/qa/extras/rtfimport/rtfimport.cxx | 32 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 439 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 93 -
writerfilter/source/rtftok/rtfsdrimport.cxx|3
writerfilter/source/rtftok/rtftokenizer.cxx|6
6 files changed, 419 insertions(+), 174 deletions(-)
New commits:
commit c8f83ce1dbf5544f6aaa91775db6820a69c3c061
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 25 12:50:46 2014 +0100
rhbz#1065629: RTF import: re-implement nested tables
The previous fix for this bug only fixed a symptom, this a fix for the
real problem; with the real problem fixed the nCellEnds is unnecessary.
Given that top-level table properties may be put either before or after the
table cells, the only way that works to import tables is to buffer a whole
top-level table row, but currently the buffer is replayed already at the
end of a nested table row.
Fortunately the RTF spec guarantees that \nesttableprops must occur
after the nested table cells of the nested row, so it should be
sufficient to remember the cell properties for the current nested table
row only, in addition to the cell properties for the top-level table row.
With this change, skipping a \nesttableprops destination when there is
a table style turns out to mangle ooo98040-1.rtf badly, so stop doing
that workaround.
RTFDocumentImpl::popState() was copying various buffers up the state
stack which is a clear indication that these shouldn't be members of
RTFParserState in the first place, move them to RTFDocumentImpl.
Change-Id: Ic2d8f7b3e00844b224d61605b405ca651239e5f7
diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
index b22ec50..7f37594 100644
--- a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -6,6 +6,26 @@
\f3\ftech\fcharset2 Symbol;
\f4\fswiss\fcharset0 Helvetica;
}
+{\colortbl
+;
+\red127\green255\blue212;
+\red0\green0\blue0;
+\red0\green0\blue255;
+\red255\green0\blue255;
+\red190\green190\blue190;
+\red0\green255\blue0;
+\red50\green205\blue50;
+\red176\green48\blue96;
+\red0\green0\blue128;
+\red85\green107\blue47;
+\red160\green32\blue240;
+\red255\green0\blue0;
+\red192\green192\blue192;
+\red0\green128\blue128;
+\red255\green255\blue255;
+\red255\green255\blue0;
+\red204\green0\blue0;
+}
{\info
{\*\userprops
{\propname creator}\proptype30
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index cecd97d..3015f23 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1383,6 +1383,38 @@ DECLARE_RTFIMPORT_TEST(testNestedTable,
rhbz1065629.rtf)
xPara.set(xParaEnum-nextElement(), uno::UNO_QUERY);
xPara.set(xParaEnum-nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(Nom: John Doe), xPara-getString());
+
+// outer table: background color, borders for B1/B2 cell
+xTable.set(xTables-getByIndex(2), uno::UNO_QUERY);
+xCell.set(xTable-getCellByName(A1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 fullPtSolid(
+1, 0, 35, 0, table::BorderLineStyle::SOLID, 35);
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, TopBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, BottomBorder));
+CPPUNIT_ASSERT_EQUAL(0xCC, getPropertysal_Int32(xCell, BackColor));
+xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 halfPtSolid(
+/*0*/1, 0, 18, 0, table::BorderLineStyle::SOLID, 18);
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0x),
+getPropertysal_Int32(xCell, BackColor));
+xCell.set(xTable-getCellByName(B2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0x),
+getPropertysal_Int32(xCell, BackColor));
}
DECLARE_RTFIMPORT_TEST(testCp116, hello.rtf)
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 626c834..621e3a5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - bridges/source
bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a606751087a2de4233c3e1fd14a7ddba993ddcea Author: Rene Engelhard r...@debian.org Date: Mon Feb 24 17:59:08 2014 +0100 fix fix gcc inline assembler operands usage Change-Id: I192c30bed60a657e9360bbe1d6dd217c75ed8da6 Reviewed-on: https://gerrit.libreoffice.org/8209 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index 063b8eb..def4e8d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -235,7 +235,7 @@ void callVirtualMethod( void * pAdjustedThisPtr, =m(o0), =m(o1), =m(f0d), -=m(f0f), +=m(f0f) : r(saveReg[0]) : ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svl/source
svl/source/filerec/filerec.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 52d3e89bc2a6af3f7411c1d95de879c106580d76 Author: Douglas Mencken dougmenc...@gmail.com Date: Mon Feb 24 11:21:33 2014 -0500 svl: don't forget about big-endian parts in filerec.cxx Fixes: (build error) filerec.cxx:591: error: no match for 'operator' Change-Id: I412cc9121c50830069e8e71c35dfb4f8ce475357 Reviewed-on: https://gerrit.libreoffice.org/8206 Tested-by: Michael Stahl mst...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 3a7b24b..5d397ea 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -588,7 +588,7 @@ bool SfxMultiRecordReader::ReadHeader_Impl() _pStream-Read( _pContentOfs, sizeof(sal_uInt32)*_nContentCount ); #else for ( sal_uInt16 n = 0; n _nContentCount; ++n ) -*_pStream _pContentOfs[n]; +_pStream-ReadUInt32( _pContentOfs[n] ); #endif _pStream-Seek( nContentPos ); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cppcanvas/source vcl/source
cppcanvas/source/inc/implrenderer.hxx |7 +--
vcl/source/filter/wmf/enhwmf.cxx |7 +--
2 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 63de81621a8d075d1df00d54798e06271083110e
Author: Douglas Mencken dougmenc...@gmail.com
Date: Mon Feb 24 11:47:03 2014 -0500
Update little-to-big endian GetSwapFloat functions
rSt pPtr[3] pPtr[2] pPtr[1] pPtr[0] results in error:
no match for 'operator' in 'rSt *(pPtr + 3u)'
Change-Id: I1820bac8c72f7633ab01a17bf5d073b988e1b58c
Reviewed-on: https://gerrit.libreoffice.org/8207
Tested-by: Michael Stahl mst...@redhat.com
Reviewed-by: Michael Stahl mst...@redhat.com
diff --git a/cppcanvas/source/inc/implrenderer.hxx
b/cppcanvas/source/inc/implrenderer.hxx
index 1762645..4f043b9b 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -137,12 +137,15 @@ namespace cppcanvas
}
#ifdef OSL_BIGENDIAN
-// currently unused
+// little endian - big endian switch
static float GetSwapFloat( SvStream rSt )
{
float fTmp;
sal_Int8* pPtr = (sal_Int8*)fTmp;
-rSt pPtr[3] pPtr[2] pPtr[1] pPtr[0];// Little
Endian - Big Endian switch
+rSt.ReadSChar( pPtr[3] );
+rSt.ReadSChar( pPtr[2] );
+rSt.ReadSChar( pPtr[1] );
+rSt.ReadSChar( pPtr[0] );
return fTmp;
}
#endif
diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index 9023c50..f2df15d 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -155,12 +155,15 @@ using namespace std;
#ifdef OSL_BIGENDIAN
-// currently unused
+// little endian - big endian switch
static float GetSwapFloat( SvStream rSt )
{
float fTmp;
sal_Int8* pPtr = (sal_Int8*)fTmp;
-rSt pPtr[3] pPtr[2] pPtr[1] pPtr[0];// little endian -
big endian switch
+rSt.ReadSChar( pPtr[3] );
+rSt.ReadSChar( pPtr[2] );
+rSt.ReadSChar( pPtr[1] );
+rSt.ReadSChar( pPtr[0] );
return fTmp;
}
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/osx
vcl/osx/a11ytextattributeswrapper.mm |2 +-
vcl/osx/a11ywrapper.mm |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b83dfcb88b77fe9adfc036cd94c9c09ddc2b7468
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 14:59:16 2014 +0100
loplugin:literaltoboolconversion
Change-Id: I74bd9af6936f00fb26273606f7924f99ee7767d3
diff --git a/vcl/osx/a11ytextattributeswrapper.mm
b/vcl/osx/a11ytextattributeswrapper.mm
index 3391037..e129ac92 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -152,7 +152,7 @@ using namespace ::rtl;
+(BOOL)convertBoolean:(PropertyValue)property {
BOOL myBoolean = NO;
-bool value = sal_False;
+bool value = false;
property.Value = value;
if ( value ) {
myBoolean = YES;
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index da7f202..4e19e1d 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -310,7 +310,7 @@ static std::ostream operator(std::ostream s, NSPoint
point) {
} catch (const Exception) {
}
-OSL_ASSERT( 0 );
+OSL_ASSERT( false );
return nil;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: fpicker/source
fpicker/source/aqua/SalAquaFilePicker.mm |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5b9f0b283b4ada78f67d2e4b134cbcf674fbd664 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 15:06:23 2014 +0100 loplugin:literaltoboolconversion Change-Id: I1e1df91ff3ca9d10e26b423ed08c81453d7d diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index a75bb24..bc244b9 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -396,7 +396,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException ) ensureFilterHelper(); m_pFilterHelper-appendFilter( aTitle, aFilter ); -m_pControlHelper-setFilterControlNeeded(YES); +m_pControlHelper-setFilterControlNeeded(true); DBG_PRINT_EXIT(CLASS_NAME, __func__); } @@ -443,7 +443,7 @@ throw( lang::IllegalArgumentException, uno::RuntimeException ) ensureFilterHelper(); m_pFilterHelper-appendFilterGroup(sGroupTitle, aFilters); -m_pControlHelper-setFilterControlNeeded(YES); +m_pControlHelper-setFilterControlNeeded(true); DBG_PRINT_EXIT(CLASS_NAME, __func__); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx| 150
writerfilter/source/dmapper/PropertyMap.cxx |2
writerfilter/source/dmapper/PropertyMap.hxx |2
writerfilter/source/dmapper/StyleSheetTable.cxx |2
4 files changed, 84 insertions(+), 72 deletions(-)
New commits:
commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Feb 25 13:16:12 2014 +
124106: correct handling of paragraph attributes, esp. whose which are
providing the default value explicitly
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6f590f7..f9ef6c5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2215,7 +2215,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
// bExchangeLeftRight = true;
Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue-getInt();
-rtl::OUString sStringValue = pValue-getString();
+const rtl::OUString sStringValue = pValue-getString();
// printf ( DomainMapper::sprm(0x%.4x, 0x%.4x) [%s]\n, (unsigned
int)nSprmId, (unsigned int)nIntValue, ::rtl::OUStringToOString(sStringValue,
RTL_TEXTENCODING_DONTKNOW).getStr());
/* WRITERFILTERSTATUS: table: sprmdata */
@@ -2254,11 +2254,14 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
/* WRITERFILTERSTATUS: comment: */
rContext-Insert(PROP_PARA_KEEP_TOGETHER, true, uno::makeAny(
nIntValue ? true : false) );
break;
+
case NS_sprm::LN_PFPageBreakBefore:
-/* WRITERFILTERSTATUS: done: 100, planned: 3, spent: 0 */
-/* WRITERFILTERSTATUS: comment: */
-rContext-Insert(PROP_BREAK_TYPE, true, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+if ( nIntValue == 1 )
+{
+rContext-Insert( PROP_BREAK_TYPE, true, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+}
break; // sprmPFPageBreakBefore
+
case NS_sprm::LN_PBrcl:
break; // sprmPBrcl
case NS_sprm::LN_PBrcp:
@@ -2327,10 +2330,9 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break;
case NS_sprm::LN_PFNoLineNumb: // sprmPFNoLineNumb
-/* WRITERFILTERSTATUS: done: 100, planned: 0, spent: 1 */
-/* WRITERFILTERSTATUS: comment: */
-rContext-Insert(PROP_PARA_LINE_NUMBER_COUNT, true, uno::makeAny(
nIntValue ? false : true) );
+rContext-Insert(PROP_PARA_LINE_NUMBER_COUNT, true, uno::makeAny(
nIntValue != 0 ? false : true) );
break;
+
case NS_sprm::LN_PChgTabsPapx: // sprmPChgTabsPapx
/* WRITERFILTERSTATUS: done: 90, planned: 8, spent: 8 */
/* WRITERFILTERSTATUS: comment: bar tab stops a unavailable */
@@ -2595,10 +2597,11 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_PBrcBar:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
break; // sprmPBrcBar
+
case NS_sprm::LN_PFNoAutoHyph: // sprmPFNoAutoHyph
-/* WRITERFILTERSTATUS: done: 100, planned: 1, spent: 0 */
-rContext-Insert(PROP_PARA_IS_HYPHENATION, true, uno::makeAny(
nIntValue ? false : true ));
+rContext-Insert(PROP_PARA_IS_HYPHENATION, true, uno::makeAny(
nIntValue != 0 ? false : true ));
break;
+
case NS_sprm::LN_PWHeightAbs:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
break; // sprmPWHeightAbs
@@ -2629,15 +2632,16 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_PFLocked:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
break; // sprmPFLocked
+
case NS_sprm::LN_PFWidowControl:
case NS_ooxml::LN_CT_PPrBase_widowControl:
-/* WRITERFILTERSTATUS: done: 100, planned: 2, spent: 0 */
{
-uno::Any aVal( uno::makeAny( sal_Int8(nIntValue ? 2 : 0 )));
+uno::Any aVal( uno::makeAny( sal_Int8(nIntValue != 0 ? 2 : 0 )));
rContext-Insert( PROP_PARA_WIDOWS, true, aVal );
rContext-Insert( PROP_PARA_ORPHANS, true, aVal );
}
break; // sprmPFWidowControl
+
case NS_sprm::LN_PRuler:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
break; // sprmPRuler
@@ -2675,34 +2679,47 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_sprm::LN_PPropRMark:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
break; // sprmPPropRMark
+
case NS_sprm::LN_POutLvl:
-/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
{
-sal_Int16 nLvl = static_cast sal_Int16 ( nIntValue );
-if( m_pImpl-IsStyleSheetImport() )
+// - nIntValue ==
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/rtfimport/rtfimport.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9d6c36dee3c7bd60f86c286d2fb5e3a00da86c84 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 15:08:47 2014 +0100 ambiguity Change-Id: Id0e3a969ff282673efd874980c25570b7ea1087b diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 3015f23..88b8ca1 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1398,7 +1398,7 @@ DECLARE_RTFIMPORT_TEST(testNestedTable, rhbz1065629.rtf) getPropertytable::BorderLine2(xCell, TopBorder)); CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid, getPropertytable::BorderLine2(xCell, BottomBorder)); -CPPUNIT_ASSERT_EQUAL(0xCC, getPropertysal_Int32(xCell, BackColor)); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xCC), getPropertysal_Int32(xCell, BackColor)); xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY); CPPUNIT_ASSERT(xCell.is()); table::BorderLine2 halfPtSolid( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm |8 ++---
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 16
+-
2 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit ddcd1507601634710e78d366d8d0fe6ce166
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 15:17:26 2014 +0100
loplugin:bodynotinblock, loplugin:literaltoboolconversion
Change-Id: I6773a4947900a6b58b556c3bac61cac784562d81
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index 72c86ce..00b3bb3 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
@@ -163,7 +163,7 @@ void OGLTransitionImpl::applyOverallOperations( double
nTime, double SlideWidthS
void OGLTransitionImpl::displaySlide( double nTime, ::sal_Int32 glSlideTex,
std::vectorPrimitive primitives,
double SlideWidthScale, double
SlideHeightScale )
{
- //TODO change to foreach
+//TODO change to foreach
glBindTexture(GL_TEXTURE_2D, glSlideTex);
// display slide reflection
@@ -179,11 +179,11 @@ void OGLTransitionImpl::displaySlide( double nTime,
::sal_Int32 glSlideTex, std:
glTranslated( 0, 2 - surfaceLevel, 0 );
glCullFace(GL_FRONT);
-for(unsigned int i(0); i primitives.size(); ++i)
-primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
+for(unsigned int i(0); i primitives.size(); ++i)
+primitives[i].display(nTime, SlideWidthScale, SlideHeightScale);
glCullFace(GL_BACK);
-slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale );
+slideShadow( nTime, primitives[0], SlideWidthScale, SlideHeightScale );
glPopMatrix();
}
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index e4b7f22..d48a831 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -405,12 +405,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView(
const Reference presenta
if( pWindow )
{
-pWindow-SetMouseTransparent( sal_True );
+pWindow-SetMouseTransparent( true );
pWindow-SetParentClipMode( PARENTCLIPMODE_NOCLIP );
-pWindow-EnableEraseBackground( sal_False );
+pWindow-EnableEraseBackground( false );
pWindow-SetControlForeground();
pWindow-SetControlBackground();
-pWindow-EnablePaint(sal_False);
+pWindow-EnablePaint(false);
pWindow-SetPosSizePixel(pPWindow-GetPosPixel(),pPWindow-GetSizePixel());
}
@@ -478,9 +478,9 @@ void OGLTransitionerImpl::setSlides( const uno::Reference
rendering::XBitmap
mbUseEnteringPixmap = false;
if( !mbUseLeavingPixmap )
-LeavingBytes = mxLeavingBitmap-getData(SlideBitmapLayout,SlideRect);
+LeavingBytes = mxLeavingBitmap-getData(SlideBitmapLayout,SlideRect);
if( !mbUseEnteringPixmap )
-EnteringBytes = mxEnteringBitmap-getData(SlideBitmapLayout,SlideRect);
+EnteringBytes = mxEnteringBitmap-getData(SlideBitmapLayout,SlideRect);
if(GLWin.pOpenGLContext)//if we have a rendering context, let's init the
slides
GLInitSlides();
@@ -724,7 +724,7 @@ void OGLTransitionerImpl::GLInitSlides()
const OGLFormat* pFormat = NULL;
if( !mbUseLeavingPixmap || !mbUseEnteringPixmap )
-pFormat = chooseFormats();
+pFormat = chooseFormats();
createTexture( GLleavingSlide,
pTransition-mbUseMipMapLeaving,
@@ -778,7 +778,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime )
throw (uno::RuntimeExc
[context makeCurrentContext];
if(pTransition)
-pTransition-display( nTime, GLleavingSlide, GLenteringSlide,
+pTransition-display( nTime, GLleavingSlide, GLenteringSlide,
SlideSize.Width, SlideSize.Height,
static_castdouble(GLWin.Width),
static_castdouble(GLWin.Height) );
@@ -892,7 +892,7 @@ void OGLTransitionerImpl::disposing()
}
if (pTransition)
-delete pTransition;
+delete pTransition;
mxLeavingBitmap.clear();
mxEnteringBitmap.clear();
___
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' - 3 commits - desktop/source
desktop/source/app/check_ext_deps.cxx|4
desktop/source/deployment/manager/dp_manager.cxx |5 +
desktop/source/deployment/misc/dp_misc.cxx |9 -
3 files changed, 17 insertions(+), 1 deletion(-)
New commits:
commit 88b7cfff9972e6c65f34a0a423971d73a0d0f746
Author: Tor Lillqvist t...@collabora.com
Date: Tue Feb 25 16:26:30 2014 +0200
Don't do the annoying restart thing when sandboxed on OS X, ignore risks...
So far we have just displayed a hugely annoying dialog sorry, but we
suck, you need to start LibreOffice again. But that sucks. So just
try to do without restart then, and let's see what happens. At least
in trivial testing, no crash.
Change-Id: I475fe49a0fdb8086bb33a165a08b32ac46548857
diff --git a/desktop/source/app/check_ext_deps.cxx
b/desktop/source/app/check_ext_deps.cxx
index bb9aadb..ec59935 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include osl/file.hxx
#include osl/mutex.hxx
@@ -419,8 +421,10 @@ void Desktop::SynchronizeExtensionRepositories()
if (m_bCleanedExtensionCache) {
deployment::ExtensionManager::get(context)-reinstallDeployedExtensions(
true, user, Referencetask::XAbortChannel(), silent);
+#if !HAVE_FEATURE_MACOSX_SANDBOX
task::OfficeRestartManager::get(context)-requestRestart(
silent-getInteractionHandler());
+#endif
} else {
// reinstallDeployedExtensions above already calls syncRepositories
// internally:
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index a086837..1fcd59f 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
+
#include dp_misc.h
#include dp_version.hxx
#include dp_interact.h
@@ -554,7 +556,7 @@ void syncRepositories(
Referencetask::XAbortChannel(), xCmdEnv);
}
}
-
+#if !HAVE_FEATURE_MACOSX_SANDBOX
if (bModified)
{
Referencetask::XRestartManager
restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext()));
@@ -565,6 +567,7 @@ void syncRepositories(
Referencetask::XInteractionHandler());
}
}
+#endif
}
void disposeBridges(Referencecss::uno::XComponentContext const ctx)
commit 84e40209e0dd7b450dd46cc2c41f57ac275910dd
Author: Tor Lillqvist t...@iki.fi
Date: Tue Feb 25 16:19:00 2014 +0200
The shared extensions are read-only in the OS X sandboxed case
Change-Id: Ie0e41ad5a5498d24a91da80dd7cc461b7fb5fa3b
diff --git a/desktop/source/deployment/manager/dp_manager.cxx
b/desktop/source/deployment/manager/dp_manager.cxx
index 5bf0c91..ce17159 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include config_features.h
#include dp_ucb.h
#include dp_resource.h
@@ -358,7 +359,11 @@ Referencedeployment::XPackageManager
PackageManagerImpl::create(
that-m_registrationData =
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER;
that-m_registryCache =
vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/registry;
logFile = vnd.sun.star.expand:$SHARED_EXTENSIONS_USER/log.txt;
+#if !HAVE_FEATURE_MACOSX_SANDBOX
+// The shared extensions are read-only when we have a
+// read-only installset, like in the OS X sandboxed case.
stamp = $UNO_SHARED_PACKAGES_CACHE;
+#endif
}
else if ( context == bundled ) {
that-m_activePackages = vnd.sun.star.expand:$BUNDLED_EXTENSIONS;
commit 4acf730fc314ffbf7667b0ec8cf033285f5874e4
Author: Tor Lillqvist t...@collabora.com
Date: Tue Feb 25 15:00:38 2014 +0200
The LO process is called just soffice on OS X
Change-Id: I74a6af7f4dc49ccf8ff3ead0d5b3e5e9b78b4f7a
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index 5a1bd22..a086837 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -61,7 +61,11 @@ using namespace ::com::sun::star::uno;
#define SWRITER swriter.exe
#endif
+#ifdef MACOSX
+#define SOFFICE2 soffice
+#else
#define SOFFICE2 soffice.bin
+#endif
namespace dp_misc {
namespace {
___
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-2' - include/vcl vcl/generic vcl/unx
include/vcl/jobdata.hxx |2 ++
vcl/generic/print/genprnpsp.cxx | 13 +++--
vcl/unx/generic/printer/cupsmgr.cxx |2 ++
vcl/unx/generic/printer/jobdata.cxx | 18 ++
4 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit b15c48ed0e3db69066ca3b2b40acfb61508dd369
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 18 18:07:37 2014 +0100
fdo#41524: CUPS printing: use collate option when PDF is available
Assume that the CUPS printer is able to handle collating by itself,
don't send multiple print jobs (except if user clicks on Create single
print jobs for collated output of course...).
To enable collating with PDF based printers, add the collate option;
legacy PS based printers still get the weird stuff read from the PPD
(not sure what the risks of changing that are).
Change-Id: Ia12dc69f9083bba94f2ed633ecbd153aac7e40ab
(cherry picked from commit c76cd71fe9bdefaef3f33f8ca193c32e3ab112ed)
Reviewed-on: https://gerrit.libreoffice.org/8116
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit 138f41fd408b120d52e3d6c185940ace065512af)
Reviewed-on: https://gerrit.libreoffice.org/8158
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/include/vcl/jobdata.hxx b/include/vcl/jobdata.hxx
index 974c049..af78db5 100644
--- a/include/vcl/jobdata.hxx
+++ b/include/vcl/jobdata.hxx
@@ -34,6 +34,7 @@ enum type {
struct VCL_DLLPUBLIC JobData
{
int m_nCopies;
+boolm_bCollate;
int m_nLeftMarginAdjust;
int m_nRightMarginAdjust;
int m_nTopMarginAdjust;
@@ -50,6 +51,7 @@ struct VCL_DLLPUBLIC JobData
JobData() :
m_nCopies( 1 ),
+m_bCollate(false),
m_nLeftMarginAdjust( 0 ),
m_nRightMarginAdjust( 0 ),
m_nTopMarginAdjust( 0 ),
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 1f080a2..d19e877 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -808,16 +808,9 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const
ImplJobSetup* pJobSetup, sal
return 0x;
case PRINTER_CAPABILITIES_COLLATECOPIES:
{
-// see if the PPD contains a value to set Collate to True
-JobData aData;
-JobData::constructFromStreamBuffer( pJobSetup-mpDriverData,
pJobSetup-mnDriverDataLen, aData );
-
-const PPDKey* pKey = aData.m_pParser ? aData.m_pParser-getKey(
OUString(Collate) ) : NULL;
-const PPDValue* pVal = pKey ? pKey-getValue(OUString(True)) :
NULL;
-
// PPDs don't mention the number of possible collated copies.
// so let's guess as many as we want ?
-return pVal ? 0x : 0;
+return 0x;
}
case PRINTER_CAPABILITIES_SETORIENTATION:
return 1;
@@ -836,7 +829,7 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const
ImplJobSetup* pJobSetup, sal
return 1;
else
{
-// see if the PPD contains a value to set Collate to True
+// see if the PPD contains a value to set PDF device
JobData aData = PrinterInfoManager::get().getPrinterInfo(
pJobSetup-maPrinterName );
if( pJobSetup-mpDriverData )
JobData::constructFromStreamBuffer(
pJobSetup-mpDriverData, pJobSetup-mnDriverDataLen, aData );
@@ -846,7 +839,7 @@ sal_uLong PspSalInfoPrinter::GetCapabilities( const
ImplJobSetup* pJobSetup, sal
return PrinterInfoManager::get().checkFeatureToken(
pJobSetup-maPrinterName, external_dialog ) ? 1 : 0;
case PRINTER_CAPABILITIES_USEPULLMODEL:
{
-// see if the PPD contains a value to set Collate to True
+// see if the PPD contains a value to set PDF device
JobData aData = PrinterInfoManager::get().getPrinterInfo(
pJobSetup-maPrinterName );
if( pJobSetup-mpDriverData )
JobData::constructFromStreamBuffer( pJobSetup-mpDriverData,
pJobSetup-mnDriverDataLen, aData );
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index 52b6bfb..069df7d 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -631,6 +631,8 @@ void CUPSManager::getOptionsFromDocumentSetup( const
JobData rJob, bool bBanner
{
OString aVal( OString::number( rJob.m_nCopies ) );
rNumOptions = cupsAddOption( copies, aVal.getStr(), rNumOptions,
(cups_option_t**)rOptions );
+aVal = OString::boolean(rJob.m_bCollate);
+rNumOptions = cupsAddOption( collate,
[Libreoffice-commits] core.git: 2 commits - cui/source include/svtools odk/GeneratedPackage_odk_javadoc.mk odk/Module_odk.mk odk/Package_javadoc.mk svtools/source sw/source
cui/source/inc/cfgutil.hxx|1
cui/source/inc/selector.hxx |1
include/svtools/treelist.hxx | 18 ++--
include/svtools/treelistbox.hxx |3
odk/GeneratedPackage_odk_javadoc.mk | 16 +++
odk/Module_odk.mk |2
odk/Package_javadoc.mk| 146 --
svtools/source/contnr/treelistbox.cxx | 10 +-
sw/source/ui/inc/conttree.hxx |3
9 files changed, 31 insertions(+), 169 deletions(-)
New commits:
commit 199705b37b129c7e215ea9a5288f9cefbb55a81a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 15:48:53 2014 +0100
Clean up confusing name clashes of non-virtual SvListView member functions
...Expand/Collapse/Select with virtual functions of the same names in
derived
classes.
Change-Id: Id2c7e434cc972ac8a789c60ceaf54dc76246be12
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 2325aaa..7dd355e 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -161,7 +161,6 @@ class SfxConfigGroupListBox : public SvTreeListBox
protected:
virtual voidRequestingChildren( SvTreeListEntry *pEntry);
-using SvListView::Expand;
virtual sal_BoolExpand( SvTreeListEntry* pParent );
public:
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index fc10f54..5c1c604 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -158,7 +158,6 @@ private:
protected:
virtual voidRequestingChildren( SvTreeListEntry *pEntry);
virtual sal_BoolExpand( SvTreeListEntry* pParent );
-using SvListView::Expand;
public:
SvxConfigGroupListBox(Window* pParent, WinBits nStyle);
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 4d0264f..049224d 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -254,6 +254,15 @@ class SVT_DLLPUBLIC SvListView
protected:
SvTreeList* pModel;
+voidExpandListEntry( SvTreeListEntry* pParent )
+{ pModel-Expand((SvListView*)this,pParent); }
+
+voidCollapseListEntry( SvTreeListEntry* pParent )
+{ pModel-Collapse((SvListView*)this,pParent); }
+
+sal_BoolSelectListEntry( SvTreeListEntry* pEntry, sal_Bool
bSelect )
+{ return pModel-Select((SvListView*)this,pEntry,bSelect); }
+
public:
SvListView(); // Sets the Model to 0
virtual ~SvListView();
@@ -319,15 +328,6 @@ public:
sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent )
const
{ return pModel-GetChildSelectionCount((SvListView*)this,pParent); }
-voidExpand( SvTreeListEntry* pParent )
-{ pModel-Expand((SvListView*)this,pParent); }
-
-voidCollapse( SvTreeListEntry* pParent )
-{ pModel-Collapse((SvListView*)this,pParent); }
-
-sal_BoolSelect( SvTreeListEntry* pEntry, sal_Bool
bSelect=sal_True )
-{ return pModel-Select((SvListView*)this,pEntry,bSelect); }
-
// Does not call the Select Handler
virtual voidSelectAll( sal_Bool bSelect, sal_Bool )
{ pModel-SelectAll((SvListView*)this, bSelect); }
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index cc0d827..a5877d0 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -524,9 +524,6 @@ public:
virtual bool set_property(const OString rKey, const OString rValue);
protected:
-using SvListView::Expand;
-using SvListView::Collapse;
-using SvListView::Select;
using SvListView::SelectAll;
SVT_DLLPRIVATE shortGetHeightOffset( const Image rBmp, Size
rLogicSize);
diff --git a/svtools/source/contnr/treelistbox.cxx
b/svtools/source/contnr/treelistbox.cxx
index 9408012..d194ebe 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -2499,7 +2499,7 @@ sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
if( ExpandingHdl() )
{
bExpanded = sal_True;
-SvListView::Expand( pParent );
+ExpandListEntry( pParent );
pImp-EntryExpanded( pParent );
pHdlEntry = pParent;
ExpandedHdl();
@@ -2537,7 +2537,7 @@ sal_Bool SvTreeListBox::Collapse( SvTreeListEntry*
pParent )
{
bCollapsed = sal_True;
pImp-CollapsingEntry( pParent );
-SvListView::Collapse( pParent );
+CollapseListEntry( pParent );
pImp-EntryCollapsed( pParent );
pHdlEntry = pParent;
ExpandedHdl();
@@ -2556,7 +2556,7 @@ sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry,
sal_Bool bSelect )
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,Select: Null-Ptr);
-sal_Bool bRetVal = SvListView::Select( pEntry, bSelect );
+sal_Bool bRetVal = SelectListEntry( pEntry,
[Libreoffice-commits] core.git: odk/CustomTarget_check.mk
odk/CustomTarget_check.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6b6433772bc7ad5f81c5ad406ad4d152ad2cc516 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 16:03:21 2014 +0100 Package - GeneratedPackage fixup Change-Id: Ib6e7a456b2f39c47da44552184669005d18d4fa4 diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 295f353..a9b542d 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ + $(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_lib) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ ___ 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' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/rhbz1065629.rtf| 20 +
sw/qa/extras/rtfimport/rtfimport.cxx | 32 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 439 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 93 -
4 files changed, 413 insertions(+), 171 deletions(-)
New commits:
commit c1bbe64bead02e4f525f0fcfe169ab4a54a89fe4
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 25 12:50:46 2014 +0100
rhbz#1065629: RTF import: re-implement nested tables
The previous fix for this bug only fixed a symptom, this a fix for the
real problem; with the real problem fixed the nCellEnds is unnecessary.
Given that top-level table properties may be put either before or after the
table cells, the only way that works to import tables is to buffer a whole
top-level table row, but currently the buffer is replayed already at the
end of a nested table row.
Fortunately the RTF spec guarantees that \nesttableprops must occur
after the nested table cells of the nested row, so it should be
sufficient to remember the cell properties for the current nested table
row only, in addition to the cell properties for the top-level table row.
With this change, skipping a \nesttableprops destination when there is
a table style turns out to mangle ooo98040-1.rtf badly, so stop doing
that workaround.
RTFDocumentImpl::popState() was copying various buffers up the state
stack which is a clear indication that these shouldn't be members of
RTFParserState in the first place, move them to RTFDocumentImpl.
(cherry picked from commit c8f83ce1dbf5544f6aaa91775db6820a69c3c061)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Ic2d8f7b3e00844b224d61605b405ca651239e5f7
Reviewed-on: https://gerrit.libreoffice.org/8221
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
index b22ec50..7f37594 100644
--- a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -6,6 +6,26 @@
\f3\ftech\fcharset2 Symbol;
\f4\fswiss\fcharset0 Helvetica;
}
+{\colortbl
+;
+\red127\green255\blue212;
+\red0\green0\blue0;
+\red0\green0\blue255;
+\red255\green0\blue255;
+\red190\green190\blue190;
+\red0\green255\blue0;
+\red50\green205\blue50;
+\red176\green48\blue96;
+\red0\green0\blue128;
+\red85\green107\blue47;
+\red160\green32\blue240;
+\red255\green0\blue0;
+\red192\green192\blue192;
+\red0\green128\blue128;
+\red255\green255\blue255;
+\red255\green255\blue0;
+\red204\green0\blue0;
+}
{\info
{\*\userprops
{\propname creator}\proptype30
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b389af6..099bb0b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1381,6 +1381,38 @@ DECLARE_RTFIMPORT_TEST(testNestedTable,
rhbz1065629.rtf)
xPara.set(xParaEnum-nextElement(), uno::UNO_QUERY);
xPara.set(xParaEnum-nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(Nom: John Doe), xPara-getString());
+
+// outer table: background color, borders for B1/B2 cell
+xTable.set(xTables-getByIndex(2), uno::UNO_QUERY);
+xCell.set(xTable-getCellByName(A1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 fullPtSolid(
+1, 0, 35, 0, table::BorderLineStyle::SOLID, 35);
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, TopBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, BottomBorder));
+CPPUNIT_ASSERT_EQUAL(0xCC, getPropertysal_Int32(xCell, BackColor));
+xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 halfPtSolid(
+/*0*/1, 0, 18, 0, table::BorderLineStyle::SOLID, 18);
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0x),
+getPropertysal_Int32(xCell, BackColor));
+xCell.set(xTable-getCellByName(B2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0x),
+getPropertysal_Int32(xCell, BackColor));
}
DECLARE_RTFIMPORT_TEST(testCp116, hello.rtf)
diff --git
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/postfixincrementfix.cxx | 132 - compilerplugins/clang/postfixincrementfix.hxx | 39 -- compilerplugins/clang/rtlconstasciimacro.cxx| 154 -- compilerplugins/clang/store/postfixincrementfix.cxx | 132 + compilerplugins/clang/store/postfixincrementfix.hxx | 39 ++ compilerplugins/clang/store/rtlconstasciimacro.cxx | 154 ++ compilerplugins/clang/store/svstreamoutputoperators.cxx | 225 compilerplugins/clang/svstreamoutputoperators.cxx | 225 8 files changed, 550 insertions(+), 550 deletions(-) New commits: commit c850cdc1bc7278116211b72b020431354f96907e Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 16:34:12 2014 +0100 Move plain rewriters to store/ (so they don' get built needlessly) Change-Id: I62d21e9a579bcb9c116bb272fc1236a890216cd9 diff --git a/compilerplugins/clang/postfixincrementfix.cxx b/compilerplugins/clang/store/postfixincrementfix.cxx similarity index 100% rename from compilerplugins/clang/postfixincrementfix.cxx rename to compilerplugins/clang/store/postfixincrementfix.cxx diff --git a/compilerplugins/clang/postfixincrementfix.hxx b/compilerplugins/clang/store/postfixincrementfix.hxx similarity index 100% rename from compilerplugins/clang/postfixincrementfix.hxx rename to compilerplugins/clang/store/postfixincrementfix.hxx diff --git a/compilerplugins/clang/rtlconstasciimacro.cxx b/compilerplugins/clang/store/rtlconstasciimacro.cxx similarity index 100% rename from compilerplugins/clang/rtlconstasciimacro.cxx rename to compilerplugins/clang/store/rtlconstasciimacro.cxx diff --git a/compilerplugins/clang/svstreamoutputoperators.cxx b/compilerplugins/clang/store/svstreamoutputoperators.cxx similarity index 100% rename from compilerplugins/clang/svstreamoutputoperators.cxx rename to compilerplugins/clang/store/svstreamoutputoperators.cxx ___ 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' - writerfilter/source
writerfilter/source/rtftok/rtfsdrimport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 84e8e9f178308f082b0c51c3e33655e3a082c057
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 25 11:55:27 2014 +0100
RTFSdrImport::resolveDhgt(): fix crashing C-cast
Inside DomainMapper::graphicZOrderHelper() this is offset by 0x40 so
whatever that cast does, it's doing it wrong.
Change-Id: Ie48467c12828137a521cba47c2e04cac65201d1d
(cherry picked from commit 8dcb56fdcea455012ef010c343ab036955678f4d)
Reviewed-on: https://gerrit.libreoffice.org/8222
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 8cbdc1b..14e2df2 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -121,7 +121,8 @@ void RTFSdrImport::popParent()
void RTFSdrImport::resolveDhgt(uno::Referencebeans::XPropertySet
xPropertySet, sal_Int32 nZOrder)
{
-writerfilter::dmapper::DomainMapper rMapper =
(writerfilter::dmapper::DomainMapper)m_rImport.Mapper();
+writerfilter::dmapper::DomainMapper rMapper =
+dynamic_castwriterfilter::dmapper::DomainMapper(m_rImport.Mapper());
writerfilter::dmapper::GraphicZOrderHelper* pHelper =
rMapper.graphicZOrderHelper();
xPropertySet-setPropertyValue(ZOrder,
uno::makeAny(pHelper-findZOrder(nZOrder)));
pHelper-addItem(xPropertySet, nZOrder);
___
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/rtftok/rtfdocumentimpl.cxx |6 +++---
writerfilter/source/rtftok/rtfdocumentimpl.hxx |3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit ddac853e0c1d8445471640c2f5f6c6d029986bd7
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Feb 25 16:38:20 2014 +0100
rtftok: pushProperties - sendProperties
We're not pushing these properties to the parser stack (as the old name
suggested), but sending them to dmapper.
Change-Id: I9725b7b92e653064c18d723f48a350ebc8e740c8
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 621e3a5..863d8ba 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1265,7 +1265,7 @@ void RTFDocumentImpl::prepareProperties(
rState.aTableRowAttributes, rState.aTableRowSprms));
}
-void RTFDocumentImpl::pushProperties(
+void RTFDocumentImpl::sendProperties(
writerfilter::ReferenceProperties::Pointer_t const pParagraphProperties,
writerfilter::ReferenceProperties::Pointer_t const pFrameProperties,
writerfilter::ReferenceProperties::Pointer_t const pTableRowProperties)
@@ -1326,7 +1326,7 @@ void RTFDocumentImpl::replayBuffer(RTFBuffer_t rBuffer,
replayRowBuffer(rRowBuffer.buffer, rRowBuffer.cellsSprms,
rRowBuffer.cellsAttributes, rRowBuffer.nCells);
-pushProperties(rRowBuffer.pParaProperties,
+sendProperties(rRowBuffer.pParaProperties,
rRowBuffer.pFrameProperties, rRowBuffer.pRowProperties);
}
else if (boost::get0(aTuple) == BUFFER_CELLEND)
@@ -2102,7 +2102,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
prepareProperties(m_aStates.top(),
paraProperties, frameProperties, rowProperties,
m_nTopLevelCells, m_nTopLevelCurrentCellX);
-pushProperties(paraProperties, frameProperties, rowProperties);
+sendProperties(paraProperties, frameProperties, rowProperties);
m_bNeedPap = true;
m_bNeedFinalPar = true;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 90609db..b6985e9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -391,7 +391,8 @@ namespace writerfilter {
writerfilter::ReferenceProperties::Pointer_t ,
writerfilter::ReferenceProperties::Pointer_t ,
int const nCells, int const nCurrentCellX);
-void pushProperties(
+/// Send the passed properties to dmapper.
+void sendProperties(
writerfilter::ReferenceProperties::Pointer_t const,
writerfilter::ReferenceProperties::Pointer_t const,
writerfilter::ReferenceProperties::Pointer_t const);
___
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/rtftok/rtfdocumentimpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f7e1e0243318743f18b6cc6a87b7307e357f953f Author: Michael Stahl mst...@redhat.com Date: Tue Feb 25 16:47:49 2014 +0100 writerfilter: attempt to appease Mac tinderboxes Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 863d8ba..1672c204 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2044,7 +2044,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) } m_aTableBufferStack.pop_back(); m_aTableBufferStack.back().push_back( -Buf_t(BUFFER_NESTROW, 0, pBuffer)); +Buf_t(BUFFER_NESTROW, RTFValue::Pointer_t(), pBuffer)); m_aNestedTableCellsSprms.clear(); m_aNestedTableCellsAttributes.clear(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 25 commits - comphelper/source include/comphelper reportdesign/source sd/source sw/source writerfilter/source
comphelper/source/container/containermultiplexer.cxx | 12 +-
comphelper/source/misc/SelectionMultiplex.cxx|3
comphelper/source/property/propmultiplex.cxx |3
include/comphelper/SelectionMultiplex.hxx|3
include/comphelper/containermultiplexer.hxx | 16 ++-
include/comphelper/propmultiplex.hxx |3
reportdesign/source/ui/dlg/Navigator.cxx | 18 ++-
sd/source/ui/unoidl/unomodule.cxx|6 -
sd/source/ui/unoidl/unomodule.hxx|6 -
sw/source/ui/inc/unotxvw.hxx | 93 ++-
sw/source/ui/uno/unotxvw.cxx | 62
sw/source/ui/vba/vbaselection.cxx|3
sw/source/ui/vba/vbaselection.hxx|4
writerfilter/source/dmapper/DomainMapper.cxx |7 +
14 files changed, 170 insertions(+), 69 deletions(-)
New commits:
commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Feb 25 13:16:12 2014 +
Related: #i124106# correct handling of page break attributes
i.e. those which are providing the default value explicitly
(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx
Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index f110e83..87c8761 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -984,7 +984,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
SectionPropertyMap * pSectionContext = m_pImpl-GetSectionContext();
Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue-getInt();
-OUString sStringValue = pValue-getString();
+const OUString sStringValue = pValue-getString();
PropertyNameSupplier rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
switch(nSprmId)
@@ -1002,7 +1002,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
rContext-Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ?
true : false) );
break;
case NS_ooxml::LN_CT_PPrBase_pageBreakBefore:
-rContext-Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+if ( nIntValue == 1 )
+{
+rContext-Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+}
break;
case NS_ooxml::LN_CT_NumPr_ilvl:
if (nIntValue 0 || 10 = nIntValue) // Writer can't do everything
commit 011df38bb218af4a6e3b1df40a7f03202fbc
Author: Caolán McNamara caol...@redhat.com
Date: Tue Feb 25 15:58:00 2014 +
coverity#983796 Uncaught exception
Change-Id: Idba161eb74fb9b474b2f41fbc0fdf0eef55b7599
diff --git a/sd/source/ui/unoidl/unomodule.cxx
b/sd/source/ui/unoidl/unomodule.cxx
index eef013d..abf56f2 100644
--- a/sd/source/ui/unoidl/unomodule.cxx
+++ b/sd/source/ui/unoidl/unomodule.cxx
@@ -114,7 +114,8 @@ uno::Sequence uno::Reference frame::XDispatch
SAL_CALL SdUnoModule::queryD
}
// XDispatchProvider
-uno::Reference frame::XDispatch SAL_CALL SdUnoModule::queryDispatch( const
util::URL aURL, const OUString, sal_Int32 ) throw( uno::RuntimeException )
+uno::Reference frame::XDispatch SAL_CALL SdUnoModule::queryDispatch( const
util::URL aURL, const OUString, sal_Int32 )
+throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
SdDLL::Init();
diff --git a/sd/source/ui/unoidl/unomodule.hxx
b/sd/source/ui/unoidl/unomodule.hxx
index 01a28af..123656b 100644
--- a/sd/source/ui/unoidl/unomodule.hxx
+++ b/sd/source/ui/unoidl/unomodule.hxx
@@ -70,7 +70,8 @@ public:
virtual css::uno::Sequence css::uno::Reference css::frame::XDispatch
SAL_CALL queryDispatches( const css::uno::Sequence
css::frame::DispatchDescriptor seqDescriptor ) throw(
css::uno::RuntimeException ) ;
virtual css::uno::Reference css::frame::XDispatch SAL_CALL
queryDispatch( const css::util::URL aURL,
const OUString
sTargetFrameName,
-sal_Int32
eSearchFlags) throw( css::uno::RuntimeException ) ;
+sal_Int32
eSearchFlags)
+throw (css::uno::RuntimeException, std::exception);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName( )
throw(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService( const OUString ServiceName )
Re: Fix for a crash test?
On 25/02/14 13:05, Miklos Vajna wrote:
Hi Julien,
On Sat, Feb 22, 2014 at 07:05:39AM -0800, julien2412 serval2...@yahoo.fr
wrote:
On pc Debian x86-64 with master sources updated yesterday, I reproduced the
crash fdo51430-1.doc.
The bt shows a failing assert because of the line 2423 of this block:
2415 else
2416 {
2417 //What I do here, is that I examine the attributes, and
if
2418 //I find out, that it's CJK/CTL, then I set the
paragraph space
2419 //to the value set in
HTML_CJK_PARSPACE/HTML_CTL_PARSPACE.
2420
2421 sal_Bool bIsCJK = false;
2422 sal_Bool bIsCTL = false;
2423 SwpHints rHints = pTxtNode-GetSwpHints(); HERE
2424 sal_uInt16 nWhich;
2425 SwTxtAttr *pHt;
(see
http://opengrok.libreoffice.org/xref/core/sw/source/filter/html/swhtml.cxx#2415)
If I check pTxtNode-HasHints() on SwHTMLParser::AddParSpace in
sw/source/filter/html/swhtml.cxx, no crash. But as often, I wonder if it's
the good fix or if I just hide a bug
In general, GetSwpHints() should only be used after a HasHints() call.
In an import filter, once again in general you are supposed to handle
all kind of strange user input. Based on that, I would just add the
HasHints() check there, unless you want to spend time on checking if the
bugdoc crashed in older versions as well (and if it did not, why that
didn't happen).
yes, what Miklos said...
apparently this was added in commit
1b0f7ee1e04d7b0fe81f7458ae2116615e0f6889 and there's another
questionable bit in there: when it finds some RES_CTL_* hint it does not
set bCTL = true but bCJK = false, so bCTL is never true?
also i wonder if the HTML import code actually sets only one of the
western/cjk/ctl font height etc. attributes or all 3 at the same time...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 5a/15ef3da683566d7bd443f96eeec3a9a3f70aeb
5a/15ef3da683566d7bd443f96eeec3a9a3f70aeb |1 + 1 file changed, 1 insertion(+) New commits: commit e74af4a8bb9a94d2f55d1136e2afe0c6531b1332 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 25 16:14:28 2014 + Notes added by 'git notes add' diff --git a/5a/15ef3da683566d7bd443f96eeec3a9a3f70aeb b/5a/15ef3da683566d7bd443f96eeec3a9a3f70aeb new file mode 100644 index 000..748ade2 --- /dev/null +++ b/5a/15ef3da683566d7bd443f96eeec3a9a3f70aeb @@ -0,0 +1 @@ +merged as: c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5 ___ 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' - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f8366d188f2d7cfe17ec802cbdff603b111eacd5
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Feb 25 13:16:12 2014 +
Related: #i124106# correct handling of page break attributes
i.e. those which are providing the default value explicitly
(cherry picked from commit 5a15ef3da683566d7bd443f96eeec3a9a3f70aeb)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/PropertyMap.cxx
(cherry picked from commit c30fb7d7269b5bdd1853ac22120f57aa2bfd13a5)
Conflicts:
writerfilter/source/dmapper/DomainMapper.cxx
Change-Id: Ib8721f2fce060d26ee75b0515b3bf62a603fd40c
Signed-off-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 6ed6ddf..4b6ed8e 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1614,7 +1614,7 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
SectionPropertyMap * pSectionContext = m_pImpl-GetSectionContext();
Value::Pointer_t pValue = rSprm.getValue();
sal_Int32 nIntValue = pValue-getInt();
-OUString sStringValue = pValue-getString();
+const OUString sStringValue = pValue-getString();
PropertyNameSupplier rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
switch(nSprmId)
@@ -1641,7 +1641,10 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
rContext-Insert(PROP_PARA_KEEP_TOGETHER, uno::makeAny( nIntValue ?
true : false) );
break;
case NS_sprm::LN_PFPageBreakBefore:
-rContext-Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+if ( nIntValue == 1 )
+{
+rContext-Insert(PROP_BREAK_TYPE, uno::makeAny(
com::sun::star::style::BreakType_PAGE_BEFORE ) );
+}
break; // sprmPFPageBreakBefore
case NS_sprm::LN_PBrcl:
break; // sprmPBrcl
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: animations/source
animations/source/animcore/animcore.cxx|8
animations/source/animcore/targetpropertiescreator.cxx |6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit f72ba183205634fb8490b1632059d3bec21901b9
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:16:36 2014 +0100
Remove visual noise from animations
Change-Id: I45b8019bebf6530136642bf34be829d7e26e2454
Reviewed-on: https://gerrit.libreoffice.org/8228
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/animations/source/animcore/animcore.cxx
b/animations/source/animcore/animcore.cxx
index b199af3..6259271 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -99,11 +99,11 @@ using namespace
::com::sun::star::animations::AnimationNodeType;
namespace animcore
{
-//
+
typedef ::std::list Reference XAnimationNode ChildList_t;
-//
+
class AnimationNodeBase : public XAnimateMotion,
public XAnimateColor,
@@ -350,7 +350,7 @@ private:
ChildList_t maChildren;
};
-//
+
class TimeContainerEnumeration : public ::cppu::WeakImplHelper1 XEnumeration
{
@@ -402,7 +402,7 @@ Any SAL_CALL TimeContainerEnumeration::nextElement()
return makeAny( (*maIter++) );
}
-//
+
Sequence Type * AnimationNode::mpTypes[] = { NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL };
Sequence sal_Int8 * AnimationNode::mpId[] = { NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL };
diff --git a/animations/source/animcore/targetpropertiescreator.cxx
b/animations/source/animcore/targetpropertiescreator.cxx
index 04cc32f..f31cddc5 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -143,13 +143,13 @@ namespace animcore
// TODO(P2): Maybe a better hash function would be to
// spread mnParagraphIndex to 32 bit: a0b0c0d0e0... Hakmem
// should have a formula.
-//
+
// Yes it has:
// x = (x 0xFF00) 8) | (x 8) 0xFF00 | x
0xFFFF;
// x = (x 0x00F000F0) 4) | (x 4) 0x00F000F0 | x
0xF00FF00F;
// x = (x 0x0C0C0C0C) 2) | (x 2) 0x0C0C0C0C | x
0xC3C3C3C3;
// x = (x 0x) 1) | (x 1) 0x | x
0x;
-//
+
// Costs about 17 cycles on a RISC machine with infinite
// instruction level parallelism (~42 basic
// instructions). Thus I truly doubt this pays off...
@@ -421,7 +421,7 @@ namespace animcore
// TODO(F1): Maybe limit functor application to main sequence
// alone (CL said something that shape visibility is only
// affected by effects in the main sequence for PPT).
-//
+
// OTOH, client code can pass us only the main sequence (which
// it actually does right now, for the slideshow implementation).
aFunctor( xRootNode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/dispatch.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8ebdae0345aa331cf6d6dabf40a6f26dc7d2371
Author: Douglas Mencken dougmenc...@gmail.com
Date: Tue Feb 25 09:55:55 2014 -0500
Yet another one undefined comparison of 'const' and a 'non-const' iterators
(hope the last one)
Change-Id: Iefcd1f5561e5a8cac4152f16e72e8f628e9204a5
Reviewed-on: https://gerrit.libreoffice.org/8223
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 4a55580..7c956e0 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2416,7 +2416,7 @@ sal_Bool SfxDispatcher::IsUpdated_Impl() const
void SfxDispatcher::SetDisableFlags( sal_uInt32 nFlags )
{
pImp-nDisableFlags = nFlags;
-for ( SfxShellStack_Impl::const_reverse_iterator it =
pImp-aStack.rbegin(); it != pImp-aStack.rend(); ++it )
+for ( SfxShellStack_Impl::reverse_iterator it = pImp-aStack.rbegin(); it
!= pImp-aStack.rend(); ++it )
(*it)-SetDisableFlags( nFlags );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sd/source starmath/source
sc/source/ui/unoobj/scdetect.cxx | 76 ---
sd/source/ui/unoidl/sddetect.cxx | 11 +
starmath/source/smdetect.cxx | 15 +++
3 files changed, 58 insertions(+), 44 deletions(-)
New commits:
commit 27c3b8bca22353dfdcf4c248539a727522fc4e76
Author: Maxim Monastirsky momonas...@gmail.com
Date: Tue Feb 25 14:16:25 2014 +0200
Don't write compound header to zero length files
Change-Id: Ie964ca8b870714d1c3e92469a771fab9a71f0633
Reviewed-on: https://gerrit.libreoffice.org/8220
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 41f3623..d56e4fe 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -510,57 +510,47 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequencebeans::PropertyValue l
pFilter = NULL;
-pStream-Seek( STREAM_SEEK_TO_END);
-sal_Size nSize = pStream-Tell();
-pStream-Seek( 0);
-// Do not attempt to create an SotStorage on a
-// 0-length stream as that would create the compound
-// document header on the stream and effectively write to
-// disk!
-if (nSize 0)
+const char* pSearchFilterName = NULL;
+if (aTypeName == calc_Lotus)
{
-const char* pSearchFilterName = NULL;
-if (aTypeName == calc_Lotus)
-{
-if (!detectThisFormat(*pStream, pLotus)
!detectThisFormat(*pStream, pLotusNew) !detectThisFormat(*pStream, pLotus2))
-return OUString();
-
-pSearchFilterName = pFilterLotus;
-}
-else if (aTypeName == calc_QPro)
-{
-if (!detectThisFormat(*pStream, pQPro))
-return OUString();
-
-pSearchFilterName = pFilterQPro6;
-}
-else if (aTypeName == calc_SYLK)
-{
-if (!detectThisFormat(*pStream, pSylk))
-return OUString();
+if (!detectThisFormat(*pStream, pLotus)
!detectThisFormat(*pStream, pLotusNew) !detectThisFormat(*pStream, pLotus2))
+return OUString();
-pSearchFilterName = pFilterSylk;
-}
-else if (aTypeName == calc_DIF)
-{
-if (!detectThisFormat(*pStream, pDIF1)
!detectThisFormat(*pStream, pDIF2))
-return OUString();
+pSearchFilterName = pFilterLotus;
+}
+else if (aTypeName == calc_QPro)
+{
+if (!detectThisFormat(*pStream, pQPro))
+return OUString();
-pSearchFilterName = pFilterDif;
-}
-else if (aTypeName == calc_dBase)
-{
-if (!lcl_MayBeDBase(*pStream))
-return OUString();
+pSearchFilterName = pFilterQPro6;
+}
+else if (aTypeName == calc_SYLK)
+{
+if (!detectThisFormat(*pStream, pSylk))
+return OUString();
-pSearchFilterName = pFilterDBase;
-}
+pSearchFilterName = pFilterSylk;
+}
+else if (aTypeName == calc_DIF)
+{
+if (!detectThisFormat(*pStream, pDIF1)
!detectThisFormat(*pStream, pDIF2))
+return OUString();
-if (!pSearchFilterName)
+pSearchFilterName = pFilterDif;
+}
+else if (aTypeName == calc_dBase)
+{
+if (!lcl_MayBeDBase(*pStream))
return OUString();
-pFilter =
aMatcher.GetFilter4FilterName(OUString::createFromAscii(pSearchFilterName));
+pSearchFilterName = pFilterDBase;
}
+
+if (!pSearchFilterName)
+return OUString();
+
+pFilter =
aMatcher.GetFilter4FilterName(OUString::createFromAscii(pSearchFilterName));
}
}
}
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 853c38e..2ec1973 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -352,6 +352,17 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence
beans::PropertyValue lDes
[Libreoffice-commits] core.git: apple_remote/source
apple_remote/source/AppleRemote.m | 22 -
apple_remote/source/HIDRemoteControlDevice.m | 10 ++--
apple_remote/source/KeyspanFrontRowControl.m | 34 +++---
apple_remote/source/MultiClickRemoteBehavior.m | 58 -
apple_remote/source/RemoteMainController.m |4 -
5 files changed, 64 insertions(+), 64 deletions(-)
New commits:
commit b2afdb85c30c27c7fce96f206aeb115cb2a193ab
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:23:41 2014 +0100
Remove visual noise from apple_remote
Change-Id: I12bec42cb699d8cbcfab2eb4d2f8ad8f5ed83b78
Reviewed-on: https://gerrit.libreoffice.org/8229
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/apple_remote/source/AppleRemote.m
b/apple_remote/source/AppleRemote.m
index 8f1b2ce..48dd9ef 100644
--- a/apple_remote/source/AppleRemote.m
+++ b/apple_remote/source/AppleRemote.m
@@ -3,13 +3,13 @@
* RemoteControlWrapper.m
* RemoteControlWrapper
*
- * Created by Martin Kahr on 11.03.06 under a MIT-style license.
+ * Created by Martin Kahr on 11.03.06 under a MIT-style license.
* Copyright (c) 2006 martinkahr.com. All rights reserved.
*
- * Code modified and adapted to OpenOffice.org
+ * Code modified and adapted to OpenOffice.org
* by Eric Bachard on 11.08.2008 under the same license
*
- * Permission is hereby granted, free of charge, to any person obtaining a
+ * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the Software),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -21,7 +21,7 @@
*
* THE SOFTWARE IS PROVIDED âAS ISâ, WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
@@ -45,15 +45,15 @@ const char* AppleRemoteDeviceName = AppleIRController;
return AppleRemoteDeviceName;
}
-- (void) setCookieMappingInDictionary: (NSMutableDictionary*)
_cookieToButtonMapping {
-
-// TODO : avoid such magics
+- (void) setCookieMappingInDictionary: (NSMutableDictionary*)
_cookieToButtonMapping {
+
+// TODO : avoid such magics
#ifdef DEBUG
NSLog( @Apple Remote: setting 10.6 cookies );
#endif
// 10.6.x Snow Leopard
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonPlus] forKey:@33_31_30_21_20_2_];
-[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonMinus] forKey:@33_32_30_21_20_2_];
+[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonMinus] forKey:@33_32_30_21_20_2_];
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonMenu]
forKey:@33_22_21_20_2_33_22_21_20_2_];
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonPlay]
forKey:@33_23_21_20_2_33_23_21_20_2_];
[_cookieToButtonMapping setObject:[NSNumber
numberWithInt:kRemoteButtonRight]
forKey:@33_24_21_20_2_33_24_21_20_2_];
@@ -72,10 +72,10 @@ const char* AppleRemoteDeviceName = AppleIRController;
if (pressedDown == NO event == kRemoteButtonMenu_Hold) {
// There is no separate event for pressed down on menu hold. We
are simulating that event here
[super sendRemoteButtonEvent:event pressedDown:YES];
- }
-
+ }
+
[super sendRemoteButtonEvent:event pressedDown:pressedDown];
-
+
if (pressedDown (event == kRemoteButtonRight || event ==
kRemoteButtonLeft || event == kRemoteButtonPlay || event == kRemoteButtonMenu
|| event == kRemoteButtonPlay_Hold)) {
// There is no separate event when the button is being
released. We are simulating that event here
[super sendRemoteButtonEvent:event pressedDown:NO];
diff --git a/apple_remote/source/HIDRemoteControlDevice.m
b/apple_remote/source/HIDRemoteControlDevice.m
index cffcfa0..e820348 100644
--- a/apple_remote/source/HIDRemoteControlDevice.m
+++ b/apple_remote/source/HIDRemoteControlDevice.m
@@ -149,23 +149,23 @@
if ([self isListeningToRemote]) return;
// 4th July 2007
- //
+
// A security update in february of 2007 introduced an odd behavior.
// Whenever SecureEventInput is activated or deactivated the exclusive
access
// to the
[Libreoffice-commits] core.git: avmedia/inc avmedia/source
avmedia/inc/mediacontrol.hxx |8 ++--
avmedia/source/framework/soundhandler.cxx| 14 +++
avmedia/source/framework/soundhandler.hxx|2 -
avmedia/source/gstreamer/gstframegrabber.hxx |4 +-
avmedia/source/gstreamer/gstmanager.hxx |4 +-
avmedia/source/gstreamer/gstplayer.hxx |4 +-
avmedia/source/gstreamer/gstwindow.hxx |4 +-
avmedia/source/quicktime/framegrabber.hxx|4 +-
avmedia/source/quicktime/framegrabber.mm | 16 -
avmedia/source/quicktime/manager.hxx |4 +-
avmedia/source/quicktime/manager.mm | 14 +++
avmedia/source/quicktime/player.hxx |4 +-
avmedia/source/quicktime/player.mm | 48 +--
avmedia/source/quicktime/quicktimeuno.mm |4 +-
avmedia/source/quicktime/window.hxx |4 +-
avmedia/source/viewer/mediaevent_impl.hxx|4 +-
avmedia/source/viewer/mediawindow.src| 12 +++---
avmedia/source/viewer/mediawindow_impl.hxx | 10 ++---
avmedia/source/win/framegrabber.hxx |4 +-
avmedia/source/win/manager.hxx |4 +-
avmedia/source/win/player.hxx|4 +-
avmedia/source/win/window.hxx|4 +-
22 files changed, 90 insertions(+), 90 deletions(-)
New commits:
commit f7a6ef74fe9b72105495b7d315ce155e01eb6489
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:37:41 2014 +0100
Remove visual noise from avmedia
Change-Id: I2f275f902359fbe557333c0062b13d1e9e96
Reviewed-on: https://gerrit.libreoffice.org/8231
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 773b5fe..d6ff00c 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -35,9 +35,9 @@ class ListBox;
namespace avmedia
{
-// -
+
// - MediaControlStyle -
-// -
+
enum MediaControlStyle
{
@@ -45,9 +45,9 @@ enum MediaControlStyle
MEDIACONTROLSTYLE_MULTILINE = 1
};
-//
+
// - MediaControl -
-// ---
+
class MediaItem;
diff --git a/avmedia/source/framework/soundhandler.cxx
b/avmedia/source/framework/soundhandler.cxx
index b0a7830..22c6720 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -33,9 +33,9 @@
namespace avmedia{
-//*
+
// XInterface, XTypeProvider, XServiceInfo
-//*
+
void SAL_CALL SoundHandler::acquire() throw()
{
@@ -189,7 +189,7 @@ void SAL_CALL SoundHandler::impl_initService()
{
}
-/*-//**
+/*-
@short standard ctor
@descr These initialize a new instance of this class with needed
information for work.
@@ -212,7 +212,7 @@ SoundHandler::SoundHandler( const css::uno::Reference
css::lang::XMultiServiceF
m_aUpdateTimer.SetTimeoutHdl(LINK(this, SoundHandler,
implts_PlayerNotify));
}
-/*-//**
+/*-
@short standard dtor
@descr -
@@ -235,7 +235,7 @@ SoundHandler::~SoundHandler()
}
}
-/*-//**
+/*-
@interface ::com::sun::star::frame::XDispatch
@short try to load audio file
@@ -314,7 +314,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL
dispatchWithNotification(aURL, lArguments, css::uno::Reference
css::frame::XDispatchResultListener ());
}
-/*-//**
+/*-
@interface ::com::sun::star::document::XExtendedFilterDetection
@short try to detect file (given as argument included in
lDescriptor)
@@ -366,7 +366,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence
css::beans::Property
return sTypeName;
}
-/*-//**
[Libreoffice-commits] core.git: basctl/sdi basctl/source
basctl/sdi/baside.sdi | 16 -
basctl/sdi/basslots.sdi|2 -
basctl/source/basicide/basicbox.cxx|8 ++--
basctl/source/basicide/basicbox.hxx|2 -
basctl/source/basicide/baside2.cxx | 18 +-
basctl/source/basicide/baside2b.cxx| 36 ++---
basctl/source/basicide/baside3.cxx |6 +--
basctl/source/basicide/bastype2.cxx|6 +--
basctl/source/basicide/bastypes.cxx| 30 -
basctl/source/basicide/documentenumeration.hxx | 16 -
basctl/source/basicide/iderdll.cxx |6 +--
basctl/source/basicide/layout.cxx |6 +--
basctl/source/basicide/layout.hxx |4 +-
basctl/source/basicide/macrodlg.hxx|2 -
basctl/source/basicide/moduldlg.cxx| 18 +-
basctl/source/basicide/objdlg.hxx |4 +-
basctl/source/basicide/scriptdocument.cxx | 12 +++
basctl/source/dlged/dlged.cxx |8 ++--
basctl/source/dlged/dlgresid.src |2 -
basctl/source/inc/accessibledialogcontrolshape.hxx |4 +-
basctl/source/inc/accessibledialogwindow.hxx |4 +-
basctl/source/inc/baside3.hxx |4 +-
basctl/source/inc/bastypes.hxx | 12 +++
basctl/source/inc/dlged.hxx|8 ++--
basctl/source/inc/dlgedclip.hxx|4 +-
basctl/source/inc/dlgedfac.hxx |4 +-
basctl/source/inc/dlgedfunc.hxx| 12 +++
basctl/source/inc/dlgedlist.hxx|8 ++--
basctl/source/inc/dlgedmod.hxx |4 +-
basctl/source/inc/dlgedobj.hxx |8 ++--
basctl/source/inc/dlgedpage.hxx|4 +-
basctl/source/inc/dlgedview.hxx|4 +-
basctl/source/inc/dlgresid.hrc |2 -
basctl/source/inc/doceventnotifier.hxx | 16 -
basctl/source/inc/docsignature.hxx | 12 +++
basctl/source/inc/scriptdocument.hxx | 16 -
36 files changed, 164 insertions(+), 164 deletions(-)
New commits:
commit 2fbd9825bce67218de2083ea1e881e98af166bf8
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:39:11 2014 +0100
Remove visual noise from basctl
Change-Id: I3e6a238a0bafbb70a7c22bde1f2258b8014ed2d2
Reviewed-on: https://gerrit.libreoffice.org/8232
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basctl/sdi/baside.sdi b/basctl/sdi/baside.sdi
index 586b328..11ab061 100644
--- a/basctl/sdi/baside.sdi
+++ b/basctl/sdi/baside.sdi
@@ -27,9 +27,9 @@ shell basctl_Shell
{
import BasicIDEView [Automation];
-//
+
// Current, je nach aktuellem Fenster:
-//
+
SID_SHOWLINES
[
StateMethod = GetState;
@@ -132,9 +132,9 @@ shell basctl_Shell
StateMethod = GetState;
]
-//
+
// Global: Egal, welches Fenster gerade aktiv ist:
-//
+
SID_BASICIDE_LIBSELECTOR
[
StateMethod = GetState;
@@ -320,9 +320,9 @@ shell basctl_Shell
StateMethod = GetState;
]
-//
+
// Nur, wenn BasicFenster oben
-//
+
SID_BASICRUN
[
ExecMethod = ExecuteBasic;
@@ -407,9 +407,9 @@ shell basctl_Shell
StateMethod = GetState;
]
-//
+
// Nur, wenn Dialogfenster oben
-//
+
SID_CHOOSE_CONTROLS
[
ExecMethod = ExecuteDialog;
diff --git a/basctl/sdi/basslots.sdi b/basctl/sdi/basslots.sdi
index 9235fd8..f85923c 100644
--- a/basctl/sdi/basslots.sdi
+++ b/basctl/sdi/basslots.sdi
@@ -25,7 +25,7 @@ HelpText( BasicIDE )
SlotIdFile( basslots.hrc )
]
{
-//=
+
include sfxitems.sdi
include sfx.sdi
include svxitems.sdi
diff --git a/basctl/source/basicide/basicbox.cxx
b/basctl/source/basicide/basicbox.cxx
index 2ccad9b..1c98157 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -83,9 +83,9 @@ Window* LibBoxControl::CreateItemWindow( Window *pParent )
return new LibBox( pParent, m_xFrame );
}
[Libreoffice-commits] core.git: crashrep/source
crashrep/source/unx/main.cxx |4 -
crashrep/source/win32/rcheader.txt |4 -
crashrep/source/win32/rctemplate.txt | 22
crashrep/source/win32/resource.h |4 -
crashrep/source/win32/soreport.cxx | 90 +--
5 files changed, 62 insertions(+), 62 deletions(-)
New commits:
commit 86709d62ab7d97a8337304ffa34ebca71e52cfb5
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:03:30 2014 +0100
Remove visual noise from crashrep
Change-Id: I9e13aa176cf6ca1d97e52d059423fc59018671f5
Reviewed-on: https://gerrit.libreoffice.org/8249
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/crashrep/source/unx/main.cxx b/crashrep/source/unx/main.cxx
index 6dc8e19..07ee976 100644
--- a/crashrep/source/unx/main.cxx
+++ b/crashrep/source/unx/main.cxx
@@ -579,7 +579,7 @@ static void setup_program_dir( const char* progname )
}
}
-//*
+
static long setup_commandline_arguments( int argc, char** argv, int *pSignal )
{
@@ -650,7 +650,7 @@ static long setup_commandline_arguments( int argc, char**
argv, int *pSignal )
return pid;
}
-//*
+
static bool read_line( FILE *fp, string rLine )
{
diff --git a/crashrep/source/win32/rcheader.txt
b/crashrep/source/win32/rcheader.txt
index 3091b4f..a94e4be 100644
--- a/crashrep/source/win32/rcheader.txt
+++ b/crashrep/source/win32/rcheader.txt
@@ -33,9 +33,9 @@
#define LANG_JAPANESE 81
#define PLACEHOLDER LANGUAGE
-// ---
+
// version information
-// ---
+
VS_VERSION_INFO versioninfo
fileversionVERSION, SUBVERSION, MICROVERSION, VERVARIANT
diff --git a/crashrep/source/win32/rctemplate.txt
b/crashrep/source/win32/rctemplate.txt
index 448ce8a..9c71356 100644
--- a/crashrep/source/win32/rctemplate.txt
+++ b/crashrep/source/win32/rctemplate.txt
@@ -1,12 +1,12 @@
-//
+
// 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
@@ -14,7 +14,7 @@
// 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 .
-//
+
#ifdef FONTSIZE
#undef FONTSIZE
@@ -29,10 +29,10 @@
#define FONTSIZE 9
-/
-//
+
+
// Dialog
-//
+
IDD_WELCOME_PAGE DIALOGEX 0, 41, 327, 195
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
@@ -145,10 +145,10 @@ BEGIN
LTEXT 3,IDC_SENDING_REPORT_STATUS,7,7,202,34
END
-/
-//
+
+
// String Table
-//
+
STRINGTABLE
BEGIN
diff --git a/crashrep/source/win32/resource.h b/crashrep/source/win32/resource.h
index 7b7c56c..83e4e3f 100644
--- a/crashrep/source/win32/resource.h
+++ b/crashrep/source/win32/resource.h
@@ -20,7 +20,7 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by soreport.rc
-//
+
#define IDD_DIALOG_FRAME101
#define IDS_WELCOME_CAPTION 102
#define IDS_WELCOME_HEADER 103
@@ -101,7 +101,7 @@
#define IDC_PROXY_DESCRIPTION 1033
#define IDC_SENDING_REPORT_STATUS 1034
// Next default values for new objects
-//
+
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1
diff --git a/crashrep/source/win32/soreport.cxx
b/crashrep/source/win32/soreport.cxx
index a48db07..0f7f760 100644
--- a/crashrep/source/win32/soreport.cxx
+++ b/crashrep/source/win32/soreport.cxx
@@ -116,7 +116,7 @@ boolg_bLoadReport = false;
#define REPORT_PORT g_uReportPort
-//***
+
// tmpfile from msvcrt creates the temporary file in the root of the current
// volume and can fail.
@@ -157,7 +157,7 @@ static FILE *_tmpfile(void)
return fp;
}
-//***
+
static BOOL GetCrashDataPath( LPTSTR szBuffer )
{
@@ -203,7 +203,7 @@ static FILE *_open_reportfile( LPCTSTR lpExt, LPCTSTR
lpMode )
return
[Libreoffice-commits] core.git: starmath/source
starmath/source/smdetect.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit aa273f05776ff6bb8e1f96d1cc3baf40a997da0e
Author: Tor Lillqvist t...@collabora.com
Date: Tue Feb 25 19:33:13 2014 +0200
WaE: declaration shadows a local variable
Change-Id: If7ecddb059fb0fae5de01666a8f088caf36bc32f
diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx
index 3d23031..43aaea9 100644
--- a/starmath/source/smdetect.cxx
+++ b/starmath/source/smdetect.cxx
@@ -326,12 +326,12 @@ OUString SAL_CALL SmFilterDetect::detect( Sequence
PropertyValue lDescriptor
// 200 should be enough for the XML
// version, encoding and !DOCTYPE
// stuff I hope?
-const sal_uInt16 nSize = 200;
-sal_Char aBuffer[nSize+1];
-aBuffer[nSize] = 0;
+const sal_uInt16 nBufferSize = 200;
+sal_Char aBuffer[nBufferSize+1];
+aBuffer[nBufferSize] = 0;
pStrm-Seek( STREAM_SEEK_TO_BEGIN );
pStrm-StartReadingUnicodeText(RTL_TEXTENCODING_DONTKNOW); // avoid BOM marker
-sal_uLong nBytesRead = pStrm-Read( aBuffer, nSize );
+sal_uLong nBytesRead = pStrm-Read( aBuffer,
nBufferSize );
if (nBytesRead = 6)
{
bool bIsMathType = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: compilerplugins/clang
compilerplugins/clang/literaltoboolconversion.cxx | 29 +-
1 file changed, 12 insertions(+), 17 deletions(-)
New commits:
commit 907ffec4907eac13bfe51c98d4f27b433b7bb36f
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Feb 25 19:03:12 2014 +0100
isIntegerConstantExpr is more general than IntegerLiteral
...and subsumes not only the use of __builtin_expect in assert, but also
the use
of __builtin_constant_p (nested) in htonl on Mac OS X.
Change-Id: I62ab6c71c42948c4ec1e2f1e1d23223cbb13416b
diff --git a/compilerplugins/clang/literaltoboolconversion.cxx
b/compilerplugins/clang/literaltoboolconversion.cxx
index bbb0cbf..5c87f47 100644
--- a/compilerplugins/clang/literaltoboolconversion.cxx
+++ b/compilerplugins/clang/literaltoboolconversion.cxx
@@ -1,4 +1,3 @@
-#includeiostream
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
@@ -47,8 +46,10 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr(
if (sub-getType()-isBooleanType()) {
return true;
}
-IntegerLiteral const * lit = dyn_castIntegerLiteral(sub);
-if (lit != nullptr lit-getValue().getLimitedValue() = 1) {
+APSInt res;
+if (sub-isIntegerConstantExpr(res, compiler.getASTContext())
+ res.getLimitedValue() = 1)
+{
SourceLocation loc { sub-getLocStart() };
while (compiler.getSourceManager().isMacroArgExpansion(loc)) {
loc = compiler.getSourceManager().getImmediateMacroCallerLoc(loc);
@@ -66,7 +67,6 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr(
return true;
}
}
-
}
if (isaStringLiteral(sub)) {
SourceLocation loc { sub-getLocStart() };
@@ -136,19 +136,14 @@ bool LiteralToBoolConversion::VisitImplicitCastExpr(
expr-getCastKindName() expr-getSubExpr()-getType()
expr-getType() expr-getSourceRange();
#endif
-} else if (sub-isIntegerConstantExpr(compiler.getASTContext())) {
-CallExpr const * ce = dyn_castCallExpr(sub);
-if (ce == nullptr
-|| compat::getBuiltinCallee(*ce) != Builtin::BI__builtin_expect)
-{
-report(
-DiagnosticsEngine::Warning,
-(implicit conversion (%0) of integer constant expression of
- type %1 to %2),
-expr-getLocStart())
- expr-getCastKindName() expr-getSubExpr()-getType()
- expr-getType() expr-getSourceRange();
-}
+} else if (sub-isIntegerConstantExpr(res, compiler.getASTContext())) {
+report(
+DiagnosticsEngine::Warning,
+(implicit conversion (%0) of integer constant expression of type
+ %1 with value %2 to %3),
+expr-getLocStart())
+ expr-getCastKindName() expr-getSubExpr()-getType()
+ res.toString(10) expr-getType() expr-getSourceRange();
}
return true;
}
___
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-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c5ccb239c8bc7cfd2b8edd3206c4ffcb3c448f1e Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Feb 25 16:05:28 2014 +0100 Updated core Project: translations 6ab678fc7365304ab9b161e926cca080e84e29fb diff --git a/translations b/translations index a848bad..6ab678f 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit a848bad50c6cd9cf5c50ca659ba63666ceded2aa +Subproject commit 6ab678fc7365304ab9b161e926cca080e84e29fb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Need help, regarding Easy Hack, Bug 64290 - UI: count selected rows and columns..
Hello, I ve been working on this easy hack for almost a week now. First of all it is not a easy hack, atleast not for the fist timers. For this hack the code pointers are not given, and i was able to find some code pointers using opengrok. Initially i looked up in the xml file to get the UI component. Then using the component ID found the .xcu file. I also found the implementation of statusbarcontroller and implementations of separate components ie, zoomctrl.cxx etc.. in svx module. Well in these controllers they require a satusbar items too. Consider i want to add a constant valued string to the bar. All i want is someone to instruct me, what all i need to take care of while creating this component. I also didn't find the code that links the component in the .xcu file and the actual implementation of the controller. Someone, please help.. Have been working on this for a very long time. This is my second easy hack, even the first one I chose didn't have an easy answer.(Easy Hack 42788 https://bugs.freedesktop.org/show_bug.cgi?id=42788).. Though have submitted what i got on the list.. Thank you. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: extras/source
extras/source/wordbook/technical.dic |1 + 1 file changed, 1 insertion(+) New commits: commit 4402f80937a342f6c1e3587c93ddb2eb391214fc Author: Andras Timar andras.ti...@collabora.com Date: Tue Feb 25 19:55:14 2014 +0100 add iOS to wordbook Change-Id: Ie0c2aaf82a918209e19f63dd895710b34013bba4 Reviewed-on: https://gerrit.libreoffice.org/8300 Reviewed-by: Andras Timar andras.ti...@collabora.com Tested-by: Andras Timar andras.ti...@collabora.com diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic index 2257cc2..deb7db7 100644 --- a/extras/source/wordbook/technical.dic +++ b/extras/source/wordbook/technical.dic @@ -106,6 +106,7 @@ iManager Impress= Intel Intrepid +iOS iPrint Jackalope Jaunty ___ 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-2' - writerfilter/source
writerfilter/source/rtftok/rtfsdrimport.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e1d3c95484918a393c9abcac83552f17a9f1921f
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 25 11:55:27 2014 +0100
RTFSdrImport::resolveDhgt(): fix crashing C-cast
Inside DomainMapper::graphicZOrderHelper() this is offset by 0x40 so
whatever that cast does, it's doing it wrong.
Change-Id: Ie48467c12828137a521cba47c2e04cac65201d1d
(cherry picked from commit 8dcb56fdcea455012ef010c343ab036955678f4d)
Reviewed-on: https://gerrit.libreoffice.org/8222
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit 84e8e9f178308f082b0c51c3e33655e3a082c057)
Reviewed-on: https://gerrit.libreoffice.org/8226
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index c13e104..8fa99ae 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -121,7 +121,8 @@ void RTFSdrImport::popParent()
void RTFSdrImport::resolveDhgt(uno::Referencebeans::XPropertySet
xPropertySet, sal_Int32 nZOrder)
{
-writerfilter::dmapper::DomainMapper rMapper =
(writerfilter::dmapper::DomainMapper)m_rImport.Mapper();
+writerfilter::dmapper::DomainMapper rMapper =
+dynamic_castwriterfilter::dmapper::DomainMapper(m_rImport.Mapper());
writerfilter::dmapper::GraphicZOrderHelper* pHelper =
rMapper.graphicZOrderHelper();
xPropertySet-setPropertyValue(ZOrder,
uno::makeAny(pHelper-findZOrder(nZOrder)));
pHelper-addItem(xPropertySet, nZOrder);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Fix for a crash test?
I submitted a patch here: https://gerrit.libreoffice.org/#/c/8307/ The goal was just to fix the crash + use a by default value for SvxULSpaceItem + fix a wrong copy paste For the rest, I must say I don't know how it should be fixed. Julien -- View this message in context: http://nabble.documentfoundation.org/Fix-for-a-crash-test-tp4098535p4098991.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx |9 ---
writerfilter/source/doctok/resources.xmi | 31 -
writerfilter/source/ooxml/model.xml|4 +--
writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 -
4 files changed, 9 insertions(+), 37 deletions(-)
New commits:
commit a65729e763641e6bdf94a5817850d61576df14d0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Feb 25 18:56:06 2014 +0100
writerfilter: sprm:CFVanish - ooxml:EG_RPrBase_{vanish,webHidden}
Change-Id: I17a6e7717db331feb2e461bb53e0131012ab0066
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 87c8761..cc4eec7 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1321,7 +1321,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_EG_RPrBase_shadow:
case NS_ooxml::LN_EG_RPrBase_caps:
case NS_ooxml::LN_EG_RPrBase_smallCaps:
-case NS_sprm::LN_CFVanish: //sprmCFVanish
+case NS_ooxml::LN_EG_RPrBase_vanish:
+case NS_ooxml::LN_EG_RPrBase_webHidden:
{
PropertyIds ePropertyId = PROP_CHAR_WEIGHT; //initialized to
prevent warning!
switch( nSprmId )
@@ -1348,7 +1349,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
case NS_ooxml::LN_EG_RPrBase_smallCaps:
ePropertyId = PROP_CHAR_CASE_MAP;
break;
-case NS_sprm::LN_CFVanish: /*sprmCFVanish*/
+case NS_ooxml::LN_EG_RPrBase_vanish:
+case NS_ooxml::LN_EG_RPrBase_webHidden:
ePropertyId = PROP_CHAR_HIDDEN;
break;
case NS_ooxml::LN_EG_RPrBase_emboss:
@@ -1429,7 +1431,8 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
break;
case NS_ooxml::LN_EG_RPrBase_outline:
case NS_ooxml::LN_EG_RPrBase_shadow:
-case NS_sprm::LN_CFVanish: /*sprmCFVanish*/
+case NS_ooxml::LN_EG_RPrBase_vanish:
+case NS_ooxml::LN_EG_RPrBase_webHidden:
rContext-Insert(ePropertyId, uno::makeAny( nIntValue
? true : false ));
break;
case NS_ooxml::LN_EG_RPrBase_smallCaps:
diff --git a/writerfilter/source/doctok/resources.xmi
b/writerfilter/source/doctok/resources.xmi
index 9d6a187..7193b43 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -286,37 +286,6 @@
/UML:ModelElement.taggedValue
/UML:Class
!--SPRM sprmCKcd--
-!--SPRM sprmCFVanish--
-UML:Class xmi.id=sprmCFVanish name=sprmCFVanish
- UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8sprm/
- /UML:ModelElement.stereotype
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValue0x083C/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmcode/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
-
UML:TaggedValue.dataValuertf:sprmCFVanish/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=sprmid/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
- UML:ModelElement.taggedValue
-UML:TaggedValue
- UML:TaggedValue.dataValuecharacter/UML:TaggedValue.dataValue
- UML:TaggedValue.type
-UML:TagDefinition xmi.idref=kind/
- /UML:TaggedValue.type
-/UML:TaggedValue
- /UML:ModelElement.taggedValue
-/UML:Class
-!--SPRM sprmCFVanish--
!--SPRM sprmCKul--
UML:Class xmi.id=sprmCKul name=sprmCKul
UML:ModelElement.stereotype
diff --git a/writerfilter/source/ooxml/model.xml
b/writerfilter/source/ooxml/model.xml
index e7ed883..cb0c805 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -23807,8 +23807,8 @@
element name=imprint tokenid=ooxml:EG_RPrBase_imprint/
element name=noProof tokenid=ooxml:EG_RPrBase_noProof/
element name=snapToGrid tokenid=ooxml:EG_RPrBase_snapToGrid/
- element name=vanish tokenid=sprm:CFVanish/
- element name=webHidden tokenid=sprm:CFVanish/
+ element name=vanish tokenid=ooxml:EG_RPrBase_vanish/
+ element name=webHidden tokenid=ooxml:EG_RPrBase_webHidden/
element name=color tokenid=ooxml:EG_RPrBase_color/
element name=spacing tokenid=sprm:CDxaSpace/
element name=w
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-2' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/rhbz1065629.rtf| 20 +
sw/qa/extras/rtfimport/rtfimport.cxx | 32 +
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 439 -
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 93 -
4 files changed, 413 insertions(+), 171 deletions(-)
New commits:
commit bfa6d3bcea13670715ccfdb0ce3500dbf8d18c88
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 25 12:50:46 2014 +0100
rhbz#1065629: RTF import: re-implement nested tables
The previous fix for this bug only fixed a symptom, this a fix for the
real problem; with the real problem fixed the nCellEnds is unnecessary.
Given that top-level table properties may be put either before or after the
table cells, the only way that works to import tables is to buffer a whole
top-level table row, but currently the buffer is replayed already at the
end of a nested table row.
Fortunately the RTF spec guarantees that \nesttableprops must occur
after the nested table cells of the nested row, so it should be
sufficient to remember the cell properties for the current nested table
row only, in addition to the cell properties for the top-level table row.
With this change, skipping a \nesttableprops destination when there is
a table style turns out to mangle ooo98040-1.rtf badly, so stop doing
that workaround.
RTFDocumentImpl::popState() was copying various buffers up the state
stack which is a clear indication that these shouldn't be members of
RTFParserState in the first place, move them to RTFDocumentImpl.
(cherry picked from commit c8f83ce1dbf5544f6aaa91775db6820a69c3c061)
Conflicts:
writerfilter/source/rtftok/rtfdocumentimpl.cxx
Change-Id: Ic2d8f7b3e00844b224d61605b405ca651239e5f7
Reviewed-on: https://gerrit.libreoffice.org/8221
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
(cherry picked from commit c1bbe64bead02e4f525f0fcfe169ab4a54a89fe4)
Reviewed-on: https://gerrit.libreoffice.org/8227
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
index b22ec50..7f37594 100644
--- a/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
+++ b/sw/qa/extras/rtfimport/data/rhbz1065629.rtf
@@ -6,6 +6,26 @@
\f3\ftech\fcharset2 Symbol;
\f4\fswiss\fcharset0 Helvetica;
}
+{\colortbl
+;
+\red127\green255\blue212;
+\red0\green0\blue0;
+\red0\green0\blue255;
+\red255\green0\blue255;
+\red190\green190\blue190;
+\red0\green255\blue0;
+\red50\green205\blue50;
+\red176\green48\blue96;
+\red0\green0\blue128;
+\red85\green107\blue47;
+\red160\green32\blue240;
+\red255\green0\blue0;
+\red192\green192\blue192;
+\red0\green128\blue128;
+\red255\green255\blue255;
+\red255\green255\blue0;
+\red204\green0\blue0;
+}
{\info
{\*\userprops
{\propname creator}\proptype30
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index b389af6..099bb0b 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1381,6 +1381,38 @@ DECLARE_RTFIMPORT_TEST(testNestedTable,
rhbz1065629.rtf)
xPara.set(xParaEnum-nextElement(), uno::UNO_QUERY);
xPara.set(xParaEnum-nextElement(), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(OUString(Nom: John Doe), xPara-getString());
+
+// outer table: background color, borders for B1/B2 cell
+xTable.set(xTables-getByIndex(2), uno::UNO_QUERY);
+xCell.set(xTable-getCellByName(A1), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 fullPtSolid(
+1, 0, 35, 0, table::BorderLineStyle::SOLID, 35);
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, RightBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, TopBorder));
+CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid,
+getPropertytable::BorderLine2(xCell, BottomBorder));
+CPPUNIT_ASSERT_EQUAL(0xCC, getPropertysal_Int32(xCell, BackColor));
+xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+table::BorderLine2 halfPtSolid(
+/*0*/1, 0, 18, 0, table::BorderLineStyle::SOLID, 18);
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+getPropertytable::BorderLine2(xCell, LeftBorder));
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(0x),
+getPropertysal_Int32(xCell, BackColor));
+xCell.set(xTable-getCellByName(B2), uno::UNO_QUERY);
+CPPUNIT_ASSERT(xCell.is());
+CPPUNIT_ASSERT_BORDER_EQUAL(halfPtSolid,
+
[Libreoffice-commits] core.git: unusedcode.easy writerfilter/inc writerfilter/source
unusedcode.easy|1 -
writerfilter/inc/resourcemodel/util.hxx|1 -
writerfilter/source/resourcemodel/util.cxx |4
3 files changed, 6 deletions(-)
New commits:
commit 02a46f9394555489884440c4fa352101f0ab7b20
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Feb 25 20:59:16 2014 +0100
Unused writerfilter::toString()
Change-Id: I8e3fa0519f1ab84c9470a82e11bb751599844185
diff --git a/unusedcode.easy b/unusedcode.easy
index 1e3158f..ea96b61 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -342,4 +342,3 @@
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar, std::ch
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*,
boost::shared_ptrwriterfilter::Referencewriterfilter::Properties )
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*, rtl::OUString
const)
writerfilter::dump(writerfilter::OutputWithDepthstd::basic_stringchar,
std::char_traitschar, std::allocatorchar , char const*, unsigned int)
-writerfilter::toString(std::basic_stringchar, std::char_traitschar,
std::allocatorchar const)
diff --git a/writerfilter/inc/resourcemodel/util.hxx
b/writerfilter/inc/resourcemodel/util.hxx
index c41f344..ff944cf 100644
--- a/writerfilter/inc/resourcemodel/util.hxx
+++ b/writerfilter/inc/resourcemodel/util.hxx
@@ -33,7 +33,6 @@ namespace writerfilter
#if OSL_DEBUG_LEVEL 1
string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC toString(uno::Reference
text::XTextRange textRange);
-string WRITERFILTER_RESOURCEMODEL_DLLPUBLIC toString(const string
rString);
#endif
}
#endif // INCLUDED_RESOURCEMODEL_UTIL_HXX
diff --git a/writerfilter/source/resourcemodel/util.cxx
b/writerfilter/source/resourcemodel/util.cxx
index 4ca4365..956da48 100644
--- a/writerfilter/source/resourcemodel/util.cxx
+++ b/writerfilter/source/resourcemodel/util.cxx
@@ -87,10 +87,6 @@ string toString(uno::Reference text::XTextRange textRange)
return result;
}
-string toString(const string rString)
-{
-return rString;
-}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: o3tl/qa
o3tl/qa/test-heap_ptr.cxx|2 +- o3tl/qa/test-vector_pool.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 13ae60336608d807fb8129a5b3f4f482ad57448a Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 19:21:23 2014 +0100 Remove visual noise from o3tl Change-Id: I15bd49dfa24b5eb260d442f15947788b41d000d1 Reviewed-on: https://gerrit.libreoffice.org/8284 Reviewed-by: Thorsten Behrens t...@documentfoundation.org Tested-by: Thorsten Behrens t...@documentfoundation.org diff --git a/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx index 9f163c2..f863b6c 100644 --- a/o3tl/qa/test-heap_ptr.cxx +++ b/o3tl/qa/test-heap_ptr.cxx @@ -150,7 +150,7 @@ class heap_ptr_test : public CppUnit::TestFixture CPPUNIT_TEST_SUITE_END(); }; // class heap_ptr_test -// - + CPPUNIT_TEST_SUITE_REGISTRATION(heap_ptr_test); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx index 1b7ca1c..c1c6677 100644 --- a/o3tl/qa/test-vector_pool.cxx +++ b/o3tl/qa/test-vector_pool.cxx @@ -83,7 +83,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// - + CPPUNIT_TEST_SUITE_REGISTRATION(vector_pool_test); /* 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: Branch 'libreoffice-4-2' - 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/rtfimport.cxx |2 +- writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3972cd911b9e8dcce5aa07aa58dbbe5f83451659 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 15:08:47 2014 +0100 ambiguity Change-Id: Id0e3a969ff282673efd874980c25570b7ea1087b (cherry picked from commit 9d6c36dee3c7bd60f86c286d2fb5e3a00da86c84) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 099bb0b..9504027 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1396,7 +1396,7 @@ DECLARE_RTFIMPORT_TEST(testNestedTable, rhbz1065629.rtf) getPropertytable::BorderLine2(xCell, TopBorder)); CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid, getPropertytable::BorderLine2(xCell, BottomBorder)); -CPPUNIT_ASSERT_EQUAL(0xCC, getPropertysal_Int32(xCell, BackColor)); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xCC), getPropertysal_Int32(xCell, BackColor)); xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY); CPPUNIT_ASSERT(xCell.is()); table::BorderLine2 halfPtSolid( commit eda7155b2b945f844204b6a15355ab0e04fee2cc Author: Michael Stahl mst...@redhat.com Date: Tue Feb 25 16:47:49 2014 +0100 writerfilter: attempt to appease Mac tinderboxes Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb (cherry picked from commit f7e1e0243318743f18b6cc6a87b7307e357f953f) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 78e4ee3..d5e7843 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2020,7 +2020,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) } m_aTableBufferStack.pop_back(); m_aTableBufferStack.back().push_back( -Buf_t(BUFFER_NESTROW, 0, pBuffer)); +Buf_t(BUFFER_NESTROW, RTFValue::Pointer_t(), pBuffer)); m_aNestedTableCellsSprms.clear(); m_aNestedTableCellsAttributes.clear(); ___ 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-2' - 2 commits - sw/qa writerfilter/source
sw/qa/extras/rtfimport/rtfimport.cxx |2 +- writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit fee514a03f623cf6383ffc04c87775e6269d1d9e Author: Michael Stahl mst...@redhat.com Date: Tue Feb 25 16:47:49 2014 +0100 writerfilter: attempt to appease Mac tinderboxes Change-Id: I014f71642f275716c8ebe7a471bf211c342145fb (cherry picked from commit f7e1e0243318743f18b6cc6a87b7307e357f953f) (cherry picked from commit eda7155b2b945f844204b6a15355ab0e04fee2cc) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 32df23e..d13c23c 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2020,7 +2020,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) } m_aTableBufferStack.pop_back(); m_aTableBufferStack.back().push_back( -Buf_t(BUFFER_NESTROW, 0, pBuffer)); +Buf_t(BUFFER_NESTROW, RTFValue::Pointer_t(), pBuffer)); m_aNestedTableCellsSprms.clear(); m_aNestedTableCellsAttributes.clear(); commit 0a5812b50ee89823c779f7a674bd4996eda4cdda Author: Stephan Bergmann sberg...@redhat.com Date: Tue Feb 25 15:08:47 2014 +0100 ambiguity Change-Id: Id0e3a969ff282673efd874980c25570b7ea1087b (cherry picked from commit 9d6c36dee3c7bd60f86c286d2fb5e3a00da86c84) Signed-off-by: Michael Stahl mst...@redhat.com (cherry picked from commit 3972cd911b9e8dcce5aa07aa58dbbe5f83451659) diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 099bb0b..9504027 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -1396,7 +1396,7 @@ DECLARE_RTFIMPORT_TEST(testNestedTable, rhbz1065629.rtf) getPropertytable::BorderLine2(xCell, TopBorder)); CPPUNIT_ASSERT_BORDER_EQUAL(fullPtSolid, getPropertytable::BorderLine2(xCell, BottomBorder)); -CPPUNIT_ASSERT_EQUAL(0xCC, getPropertysal_Int32(xCell, BackColor)); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xCC), getPropertysal_Int32(xCell, BackColor)); xCell.set(xTable-getCellByName(A2), uno::UNO_QUERY); CPPUNIT_ASSERT(xCell.is()); table::BorderLine2 halfPtSolid( ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: slideshow/source slideshow/test
slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m | 24 +- slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m | 12 ++--- slideshow/source/engine/activities/activitybase.cxx | 20 slideshow/source/engine/activities/discreteactivitybase.cxx | 10 ++-- slideshow/source/engine/activities/simplecontinuousactivitybase.cxx |6 +- slideshow/source/engine/animatedsprite.cxx |2 slideshow/source/engine/animationfactory.cxx|2 slideshow/source/engine/animationnodes/animationbasenode.cxx| 12 ++--- slideshow/source/engine/animationnodes/animationnodefactory.cxx |6 +- slideshow/source/engine/animationnodes/basenode.cxx |2 slideshow/source/engine/animationnodes/nodetools.hxx|2 slideshow/source/engine/color.cxx |4 - slideshow/source/engine/eventmultiplexer.cxx| 10 ++-- slideshow/source/engine/screenupdater.cxx |8 +-- slideshow/source/engine/shapes/backgroundshape.cxx |4 - slideshow/source/engine/shapes/drawinglayeranimation.cxx| 10 ++-- slideshow/source/engine/shapes/drawshape.cxx| 20 slideshow/source/engine/shapes/drawshape.hxx| 16 +++--- slideshow/source/engine/shapes/drawshapesubsetting.cxx | 18 +++ slideshow/source/engine/shapes/drawshapesubsetting.hxx |6 +- slideshow/source/engine/shapes/externalshapebase.hxx|6 +- slideshow/source/engine/shapes/gdimtftools.hxx |2 slideshow/source/engine/shapes/intrinsicanimationactivity.cxx |6 +- slideshow/source/engine/shapes/viewappletshape.hxx |4 - slideshow/source/engine/shapes/viewmediashape.hxx |4 - slideshow/source/engine/shapes/viewshape.cxx|2 slideshow/source/engine/shapes/viewshape.hxx|4 - slideshow/source/engine/slide/layer.hxx |4 - slideshow/source/engine/slide/layermanager.hxx |2 slideshow/source/engine/slide/shapemanagerimpl.hxx | 14 ++--- slideshow/source/engine/slide/slideimpl.cxx |4 - slideshow/source/engine/slideshowimpl.cxx |2 slideshow/source/engine/slideview.cxx |2 slideshow/source/engine/smilfunctionparser.cxx |6 +- slideshow/source/engine/sp_debug.cxx|8 +-- slideshow/source/engine/transitions/slidetransitionfactory.cxx |4 - slideshow/source/engine/transitions/transitionfactorytab.cxx|8 +-- slideshow/source/engine/usereventqueue.cxx |2 slideshow/source/inc/animatableshape.hxx|2 slideshow/source/inc/attributableshape.hxx |4 - slideshow/source/inc/eventmultiplexer.hxx |8 +-- slideshow/source/inc/externalmediashape.hxx |2 slideshow/source/inc/listenercontainer.hxx |4 - slideshow/source/inc/shape.hxx | 12 ++--- slideshow/source/inc/shapeattributelayer.hxx|6 +- slideshow/source/inc/slide.hxx |6 +- slideshow/source/inc/transitioninfo.hxx |4 - slideshow/test/tests.hxx|2 slideshow/test/testshape.cxx|2 49 files changed, 164 insertions(+), 166 deletions(-) New commits: commit 6f2691bb6c9cacf1df547c0e38225461f018f696 Author: Alexander Wilms f.alexander.wi...@gmail.com Date: Tue Feb 25 20:37:55 2014 +0100 Remove visual noise from slideshow Change-Id: I87d07afbffa9d4633ed31bdb88f2dad660c25a18 diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m index 339c36c..fb25114 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m @@ -2,7 +2,7 @@ /* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ /* Subclass should put initialisation code that can be performaned lazily (on first frame render) here */ initialised = TRUE; - + /* Create a GLU quadric, used for rendering certain geometry */
[Libreoffice-commits] core.git: cppcanvas/source
cppcanvas/source/mtfrenderer/implrenderer.cxx | 10 +-
cppcanvas/source/mtfrenderer/textaction.cxx |8
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 8448d136ecc889f9a8fe85d883f0fd0e612c1c4e
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 18:00:05 2014 +0100
Remove visual noise from cppcanvas
Change-Id: I961e6a9e227962096b57569a8b8160841cacd950
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx
b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 663c475..52f5278 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -186,7 +186,7 @@ namespace
// iteratively fill dash array, first with dashs, then
// with dots.
-// ===
+
sal_Int32 nCurrEntry=0;
@@ -2789,12 +2789,12 @@ namespace cppcanvas
aRangeEnd-mnOrigIndex nEndIndex )
{
// aRangeEnd denotes end of action vector,
-//
+
// or
-//
+
// nEndIndex references something _after_
// aRangeBegin, but _before_ aRangeEnd
-//
+
// either way: no partial action left
return rFunctor.result();
}
@@ -2861,7 +2861,7 @@ namespace cppcanvas
// Public methods
-//
+
ImplRenderer::ImplRenderer( const CanvasSharedPtr rCanvas,
const GDIMetaFile rMtf,
diff --git a/cppcanvas/source/mtfrenderer/textaction.cxx
b/cppcanvas/source/mtfrenderer/textaction.cxx
index 4e44664..2bab8aa 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.cxx
@@ -1919,11 +1919,11 @@ namespace cppcanvas
}
-//
==
-//
+
+
// Action factory methods
-//
-//
==
+
+
/** Create an outline action
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: canvas/source canvas/workben
canvas/source/cairo/cairo_spritecanvashelper.hxx |2
canvas/source/cairo/cairo_xlib_cairo.cxx |2
canvas/source/directx/dx_9rm.cxx | 124 +-
canvas/source/directx/dx_bitmap.cxx |4
canvas/source/directx/dx_canvas.hxx |2
canvas/source/directx/dx_canvashelper_texturefill.cxx |4
canvas/source/directx/dx_spritecanvashelper.hxx |2
canvas/source/directx/dx_surfacebitmap.cxx| 76 +--
canvas/source/directx/dx_textlayout_drawhelper.cxx|2
canvas/source/directx/dx_vcltools.cxx | 12 -
canvas/source/opengl/ogl_spritedevicehelper.hxx |2
canvas/source/simplecanvas/simplecanvasimpl.cxx |4
canvas/source/tools/elapsedtime.cxx |4
canvas/source/tools/pagemanager.cxx | 32 ++--
canvas/source/tools/pagemanager.hxx |8 -
canvas/source/tools/spriteredrawmanager.cxx |2
canvas/source/tools/surface.cxx | 36 ++---
canvas/source/tools/surface.hxx |4
canvas/source/tools/surfaceproxy.cxx | 20 +-
canvas/source/tools/surfaceproxy.hxx |4
canvas/source/tools/surfaceproxymanager.cxx |8 -
canvas/source/tools/surfacerect.hxx |4
canvas/source/vcl/canvashelper_texturefill.cxx|4
canvas/source/vcl/spritecanvashelper.hxx |2
canvas/workben/canvasdemo.cxx |2
25 files changed, 183 insertions(+), 183 deletions(-)
New commits:
commit 8747200c87afa81177f2da8ec9bd46996156c307
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:46:23 2014 +0100
Remove visual noise from canvas
Change-Id: I0f01a4064ab6d1f55647ecdc1a8710e289e5d96c
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx
b/canvas/source/cairo/cairo_spritecanvashelper.hxx
index b18747e9..9bec3df 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx
@@ -88,7 +88,7 @@ namespace cairocanvas
// SpriteRedrawManager functor calls
-// -
+
/** Gets called for simple background repaints
*/
diff --git a/canvas/source/cairo/cairo_xlib_cairo.cxx
b/canvas/source/cairo/cairo_xlib_cairo.cxx
index bae6943..f52a8e7 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.cxx
@@ -37,7 +37,7 @@ namespace
{
// The X protocol request CreatePixmap puts an upper bound
// of 16 bit to the size.
-//
+
// see, e.g. moz#424333, fdo#48961
// we've a duplicate of this in vcl :-(
if (width SAL_MAX_INT16 || height SAL_MAX_INT16)
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 6323ca4..aab6683 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -73,17 +73,17 @@
using namespace ::com::sun::star;
-//
+
// 'dxcanvas' namespace
-//
+
namespace dxcanvas
{
namespace
{
-
//
+
// monitorSupport
-
//
+
class monitorSupport
{
@@ -127,9 +127,9 @@ namespace dxcanvas
class DXRenderModule;
-
//
+
// DXSurface
-
//
+
/** ISurface implemenation.
@@ -173,9 +173,9 @@ namespace dxcanvas
};
-
//
+
// DXRenderModule
-
//
+
/// Default implementation of IDXRenderModule
class DXRenderModule : public IDXRenderModule
@@ -256,9 +256,9 @@ namespace dxcanvas
::osl::Mutex DXRenderModule::maMutex;
-
//
+
// DXSurface::ImplRenderModuleGuard
-
//
+
inline DXSurface::ImplRenderModuleGuard::ImplRenderModuleGuard(
DXRenderModule rRenderModule ) :
@@ -296,9 +296,9 @@ namespace dxcanvas
}
}
-
[Libreoffice-commits] core.git: basegfx/source basegfx/test
basegfx/source/color/bcolormodifier.cxx | 20 ++--
basegfx/source/color/bcolortools.cxx |2
basegfx/source/curve/b2dbeziertools.cxx |2
basegfx/source/curve/b2dcubicbezier.cxx |8 -
basegfx/source/matrix/b2dhommatrix.cxx|2
basegfx/source/matrix/b2dhommatrixtools.cxx |2
basegfx/source/point/b2dpoint.cxx |2
basegfx/source/polygon/b2dlinegeometry.cxx|4
basegfx/source/polygon/b2dpolygon.cxx | 14 +--
basegfx/source/polygon/b2dpolygonclipper.cxx | 36 +++-
basegfx/source/polygon/b2dpolygoncutandtouch.cxx | 60 +++---
basegfx/source/polygon/b2dpolygontools.cxx|8 -
basegfx/source/polygon/b2dpolygontriangulator.cxx |8 -
basegfx/source/polygon/b2dpolypolygon.cxx |4
basegfx/source/polygon/b2dpolypolygoncutter.cxx | 32 +++
basegfx/source/polygon/b2dpolypolygontools.cxx| 16 +--
basegfx/source/polygon/b2dsvgpolypolygon.cxx |6 -
basegfx/source/polygon/b2dtrapezoid.cxx | 24 ++---
basegfx/source/polygon/b3dpolygon.cxx | 14 +--
basegfx/source/polygon/b3dpolygontools.cxx|4
basegfx/source/polygon/b3dpolypolygon.cxx |4
basegfx/source/polygon/b3dpolypolygontools.cxx|6 -
basegfx/source/range/b2drangeclipper.cxx |8 -
basegfx/source/raster/rasterconvert3d.cxx |2
basegfx/source/tools/unotools.cxx |2
basegfx/source/vector/b3dvector.cxx |2
basegfx/source/workbench/bezierclip.cxx | 92 +++---
basegfx/test/basegfx2d.cxx| 10 +-
28 files changed, 193 insertions(+), 201 deletions(-)
New commits:
commit a96d7ce3904f4dfd08d47170e926b15b5f7dae3d
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:40:34 2014 +0100
Remove visual noise from basegfx
Change-Id: I9a28405ab92605203ec380f89f5aee91f042d91a
diff --git a/basegfx/source/color/bcolormodifier.cxx
b/basegfx/source/color/bcolormodifier.cxx
index c1f7026..ae0fdee 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.cxx
@@ -19,7 +19,7 @@
#include basegfx/color/bcolormodifier.hxx
-//
+
namespace basegfx
{
@@ -28,7 +28,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -49,7 +49,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -68,7 +68,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -89,7 +89,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -115,7 +115,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -141,7 +141,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -176,7 +176,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -228,7 +228,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
@@ -311,7 +311,7 @@ namespace basegfx
}
} // end of namespace basegfx
-//
+
namespace basegfx
{
diff --git a/basegfx/source/color/bcolortools.cxx
b/basegfx/source/color/bcolortools.cxx
index 838a10d..400eb91 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.cxx
@@ -21,7 +21,7 @@
#include basegfx/color/bcolor.hxx
#include basegfx/color/bcolortools.hxx
-//
+
namespace basegfx { namespace tools
{
diff --git a/basegfx/source/curve/b2dbeziertools.cxx
b/basegfx/source/curve/b2dbeziertools.cxx
index 153b3c7..e7d77ce 100644
--- a/basegfx/source/curve/b2dbeziertools.cxx
+++ b/basegfx/source/curve/b2dbeziertools.cxx
@@ -21,7 +21,7 @@
#include basegfx/curve/b2dcubicbezier.hxx
#include algorithm
-//
+
namespace basegfx
{
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx
[Libreoffice-commits] core.git: sw/source wizards/com xmloff/source
sw/source/core/access/accframe.cxx |2 +-
sw/source/core/layout/tabfrm.cxx |2 +-
wizards/com/sun/star/wizards/ui/UnoDialog.java |2 +-
wizards/com/sun/star/wizards/ui/UnoDialog.py |2 +-
xmloff/source/text/txtparae.cxx|2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit f8adeb290048fbb5aa104997145d7a5a421efa2a
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Feb 25 21:55:23 2014 +0100
(T/t)herfor - (T/t)herefore
Change-Id: I7678d3afa8ecde5160a3f0d731b923f3bfca
diff --git a/sw/source/core/access/accframe.cxx
b/sw/source/core/access/accframe.cxx
index 34e7210..b95d739 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -41,7 +41,7 @@
using namespace sw::access;
// Regarding visibility (or in terms of accessibility: regarding the showing
-// state): A frame is visible and therfor contained in the tree if its frame
+// state): A frame is visible and therefore contained in the tree if its frame
// size overlaps with the visible area. The bounding box however is the
// frame's paint area.
sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap rAccMap,
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 3624da6..2b3d285 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4447,7 +4447,7 @@ SwCellFrm::~SwCellFrm()
if( pMod )
{
// At this stage the lower frames aren't destroyed already,
-// therfor we have to do a recursive dispose.
+// therefore we have to do a recursive dispose.
SwRootFrm *pRootFrm = getRootFrm();
if( pRootFrm pRootFrm-IsAnyShellAccessible()
pRootFrm-GetCurrShell() )
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index cdc7b8b..ec3b6b2 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -521,7 +521,7 @@ public class UnoDialog implements EventNames
/**
* The problem with setting the visibility of controls is that changing
the current step
* of a dialog will automatically make all controls visible. The
PropertyNames.PROPERTY_STEP property always wins against
- * the property visible. Therfor a control meant to be invisible is
placed on a step far far away.
+ * the property visible. Therefore a control meant to be invisible is
placed on a step far far away.
* @param controlname the name of the control
* @param iStep change the step if you want to make the control invisible
*/
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py
b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index f511ebb..81484fc 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -93,7 +93,7 @@ class UnoDialog(object):
changing the current step of a dialog will automatically make
all controls visible. The PropertyNames.PROPERTY_STEP property
always wins against the property visible.
-Therfor a control meant to be invisible is placed on a step far far away.
+Therefore a control meant to be invisible is placed on a step far far away.
Afterwards the step property of the dialog has to be set with
repaintDialogStep. As the performance of that method is very bad it
should be used only once for all controls
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 95f6f0ce5..c997d09a 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2129,7 +2129,7 @@ void XMLTextParagraphExport::exportParagraph(
if( bHasContentEnum )
{
// For the auto styles, the multi property set helper is only used
-// if hard attributes are existing. Therfor, it seems to be a better
+// if hard attributes are existing. Therefore, it seems to be a better
// strategy to have the TextSection property separate, because
otherwise
// we always retrieve the style names even if they are not required.
if( bAutoStyles )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dtrans/source fpicker/source slideshow/source
dtrans/source/win32/dtobj/XTDataObject.hxx |2 +- dtrans/source/win32/workbench/XTDo.hxx |2 +- fpicker/source/win32/filepicker/helppopupwindow.hxx|2 +- slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx |2 +- slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm |2 +- slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx |2 +- 6 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 36774806da0f23897ff9c0b619bf17068d2213cd Author: Julien Nabet serval2...@yahoo.fr Date: Tue Feb 25 22:00:50 2014 +0100 (a/A)utomaticaly - (a/A)utomatically Change-Id: Ice4327bdb8e5a14ef082f013fa513b2267f0fbf3 diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx index a8a87c6..a8d0c94 100644 --- a/dtrans/source/win32/dtobj/XTDataObject.hxx +++ b/dtrans/source/win32/dtobj/XTDataObject.hxx @@ -52,7 +52,7 @@ appropriate clipboard formats - if the transferable contains text data always text and unicodetext will be offered or vice versa -- text data will be automaticaly converted between text und unicode text +- text data will be automatically converted between text und unicode text - although the transferable may support text in different charsets (codepages) only text in one codepage can be offered by the clipboard diff --git a/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx index 5d87dbc..2a9116a 100644 --- a/dtrans/source/win32/workbench/XTDo.hxx +++ b/dtrans/source/win32/workbench/XTDo.hxx @@ -50,7 +50,7 @@ class EnumFormatEtc; appropriate clipboard formats - if the transferable contains text data always text and unicodetext will be offered or vice versa -- text data will be automaticaly converted between text und unicode text +- text data will be automatically converted between text und unicode text - although the transferable may support text in different charsets (codepages) only text in one codepage can be offered by the clipboard diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx index ff476cb..ae0179a 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.hxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx @@ -44,7 +44,7 @@ The interface is very simple but necessary for our needs. -The window automaticaly calculates the necessary +The window automatically calculates the necessary dimensions of the window and a appropriate show position based on the position the client provides. When the user click any mouse button or hits any key diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx index 0e99164..8a6ce80 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx @@ -368,7 +368,7 @@ public: #endif }; -// declare the static variables as some gcc versions have problems declaring them automaticaly +// declare the static variables as some gcc versions have problems declaring them automatically bool OGLTransitionerImpl::cbBrokenTexturesATI; float OGLTransitionerImpl::cnGLVersion; bool OGLTransitionerImpl::cbMesa; diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm index d48a831..d4903961 100644 --- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm +++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm @@ -285,7 +285,7 @@ public: #endif }; -// declare the static variables as some gcc versions have problems declaring them automaticaly +// declare the static variables as some gcc versions have problems declaring them automatically /**/ bool OGLTransitionerImpl::cbBrokenTexturesATI; diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx index 36a96cb..f24466b 100644 --- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx +++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx @@ -297,7 +297,7 @@ public: #endif }; -// declare the static variables as some gcc versions have problems declaring them automaticaly +// declare the static variables as some gcc versions have problems declaring them automatically bool OGLTransitionerImpl::cbBrokenTexturesATI; float OGLTransitionerImpl::cnGLVersion; bool OGLTransitionerImpl::cbMesa; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org
[Libreoffice-commits] core.git: forms/source qadevOOo/runner reportbuilder/java xmloff/source
forms/source/xforms/binding.cxx
|2 +-
qadevOOo/runner/lib/MultiPropertyTest.java
|2 +-
reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
|2 +-
xmloff/source/transform/OOo2Oasis.cxx
|2 +-
xmloff/source/transform/Oasis2OOo.cxx
|2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit f1a73892b3c4d2218a4b2941f6fc45d892f66d39
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Feb 25 22:04:17 2014 +0100
Typo: apropriate - appropriate
Change-Id: I05e23039dc3ae0b6595c87fe550f4228ad93d5d6
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index 4f9b07d..1e5862a 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -666,7 +666,7 @@ void Binding::bind( bool bForceRebind )
}
}
-// now evaluate remaining MIPs in the apropriate context
+// now evaluate remaining MIPs in the appropriate context
maReadonly.evaluate( rContext );
maRelevant.evaluate( rContext );
maRequired.evaluate( rContext );
diff --git a/qadevOOo/runner/lib/MultiPropertyTest.java
b/qadevOOo/runner/lib/MultiPropertyTest.java
index bffd568..6d22968 100644
--- a/qadevOOo/runner/lib/MultiPropertyTest.java
+++ b/qadevOOo/runner/lib/MultiPropertyTest.java
@@ -467,7 +467,7 @@ public class MultiPropertyTest extends MultiMethodTest
* The method compares obj1 and obj2. It calls
* MultiPropertyTest.compare, but subclasses can override to change
* the behaviour, since normally compare calls Object.equals method
- * which is not apropriate in some cases(e.g., structs with equals
+ * which is not appropriate in some cases(e.g., structs with equals
* not overridden).
*/
protected boolean compare(Object obj1, Object obj2)
diff --git
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
index 4e731466..d1c5b41 100644
---
a/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
+++
b/reportbuilder/java/org/libreoffice/report/pentaho/output/OfficeDocumentReportTarget.java
@@ -504,7 +504,7 @@ public abstract class OfficeDocumentReportTarget extends
AbstractReportTarget
}
/**
- * Starts the processing of an element and updates the processing state.
This will select an apropriate handler method
+ * Starts the processing of an element and updates the processing state.
This will select an appropriate handler method
* for the call and will call one of the start* methods.
*
* @param roAttrs the attribute map for the current element
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index 5e3f849..60491fb 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -704,7 +704,7 @@ static XMLTransformerActionInit aStyleRefActionTable[] =
// OOO_SHAPE_ACTIONS
// !!ATTENTION!! If you change something here, please also change
-// aConnectorActionTable if apropriate
+// aConnectorActionTable if appropriate
static XMLTransformerActionInit aShapeActionTable[] =
{
ENTRY0( SVG, X, XML_ATACTION_INCH2IN ),
diff --git a/xmloff/source/transform/Oasis2OOo.cxx
b/xmloff/source/transform/Oasis2OOo.cxx
index ff1adbe..f818980 100644
--- a/xmloff/source/transform/Oasis2OOo.cxx
+++ b/xmloff/source/transform/Oasis2OOo.cxx
@@ -709,7 +709,7 @@ static XMLTransformerActionInit aParaActionTable[] =
};
// !!ATTENTION!! If you change something here, please also change
-// aConnectorActionTable if apropriate
+// aConnectorActionTable if appropriate
static XMLTransformerActionInit aShapeActionTable[] =
{
ENTRY1( DRAW, STYLE_NAME, XML_ATACTION_DECODE_STYLE_NAME_REF,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #105 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Stefan Ring committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=5fce5642b65459fe165bcab5fd7d9217d3aee4ed fdo#39468 Translate German comments: sw/source/filter/ww1 The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: basic/source
basic/source/basmgr/basicmanagerrepository.cxx | 28 ++--
basic/source/basmgr/basmgr.cxx | 28 ++--
basic/source/basmgr/vbahelper.cxx | 10 +++
basic/source/classes/eventatt.cxx |4 +-
basic/source/classes/propacc.cxx |2 -
basic/source/classes/sb.cxx| 10 +++
basic/source/classes/sbunoobj.cxx | 34 -
basic/source/classes/sbxmod.cxx|2 -
basic/source/comp/codegen.cxx |2 -
basic/source/inc/codegen.hxx |4 +-
basic/source/inc/dlgcont.hxx |4 +-
basic/source/inc/namecont.hxx | 18 ++---
basic/source/inc/propacc.hxx |6 ++--
basic/source/inc/sbunoobj.hxx |2 -
basic/source/inc/scriptcont.hxx|6 ++--
basic/source/runtime/methods.cxx |4 +-
basic/source/runtime/runtime.cxx | 12
basic/source/sbx/sbxbase.cxx |6 ++--
basic/source/sbx/sbxcurr.cxx |2 -
basic/source/sbx/sbxform.cxx | 10 +++
basic/source/sbx/sbxvals.cxx |2 -
basic/source/sbx/sbxvalue.cxx | 12
basic/source/sbx/sbxvar.cxx| 20 +++---
basic/source/uno/dlgcont.cxx |6 ++--
basic/source/uno/namecont.cxx | 10 +++
basic/source/uno/sbmodule.cxx |8 ++---
basic/source/uno/sbmodule.hxx |8 ++---
basic/source/uno/sbservices.cxx|8 ++---
basic/source/uno/scriptcont.cxx|8 ++---
29 files changed, 138 insertions(+), 138 deletions(-)
New commits:
commit 6a38eace8c0936c507cb02b8d0dd09e837a183fd
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:41:32 2014 +0100
Remove visual noise from basic
Change-Id: I10865b94f67de39e9dbcbe71ede42aa94d81db61
Reviewed-on: https://gerrit.libreoffice.org/8234
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index 0e483d6..3160075 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -46,10 +46,10 @@
#include map
-//
+
namespace basic
{
-//
+
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XComponentContext;
@@ -73,9 +73,9 @@ namespace basic
typedef ::std::vector BasicManagerCreationListener* CreationListeners;
-//
+
//= BasicManagerCleaner
-//
+
/// is the only instance which is allowed to delete a BasicManager instance
class BasicManagerCleaner
{
@@ -87,9 +87,9 @@ namespace basic
}
};
-//
+
//= ImplRepository
-//
+
class ImplRepository : public ::utl::OEventListenerAdapter, public
SfxListener
{
private:
@@ -207,9 +207,9 @@ namespace basic
StarBASIC* impl_getDefaultAppBasicLibrary();
};
-//
+
//= CreateImplRepository
-//
+
struct CreateImplRepository
{
ImplRepository* operator()()
@@ -220,9 +220,9 @@ namespace basic
};
-//
+
//= ImplRepository
-//
+
ImplRepository::ImplRepository()
{
@@ -609,9 +609,9 @@ namespace basic
}
}
-//
+
//= BasicManagerRepository
-//
+
BasicManager* BasicManagerRepository::getDocumentBasicManager( const
Reference XModel _rxDocumentModel )
{
@@ -642,8 +642,8 @@ namespace basic
ImplRepository::Instance().revokeCreationListener( _rListener );
}
-//
+
} // namespace basic
-//
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/basmgr/basmgr.cxx
[Libreoffice-commits] core.git: binaryurp/source
binaryurp/source/cache.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 598243b2d8e8bd3496d88affdbccee6c11566c69
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:43:38 2014 +0100
Remove visual noise from binaryurp
Change-Id: I863499cccfe586b570d0021e143718bd3e4e1181
Reviewed-on: https://gerrit.libreoffice.org/8236
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/binaryurp/source/cache.hxx b/binaryurp/source/cache.hxx
index 7e5ba89..a580c5e 100644
--- a/binaryurp/source/cache.hxx
+++ b/binaryurp/source/cache.hxx
@@ -60,7 +60,7 @@ public:
typedef std::pairtypename LruItMap::iterator,bool MapPair;
MapPair aMP = map_.insert( MappedType( list_.begin(), 0));
*pbFound = !aMP.second;
-
+
if( !aMP.second) { // insertion not needed = found the entry
list_.pop_front(); // remove the temp entry
list_.splice( list_.begin(), list_, aMP.first-first); // the
found entry is moved to front
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bean/com
bean/com/sun/star/beans/LocalOfficeConnection.java |2 -
bean/com/sun/star/beans/LocalOfficeWindow.java |2 -
bean/com/sun/star/comp/beans/Controller.java |8 +++
bean/com/sun/star/comp/beans/Frame.java| 12 +--
bean/com/sun/star/comp/beans/OOoBean.java | 10 -
bean/com/sun/star/comp/beans/OfficeDocument.java | 22 ++---
bean/com/sun/star/comp/beans/Wrapper.java | 10 -
7 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 54932e7e182962c4084dcbc094650eec13960029
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 17:42:33 2014 +0100
Remove visual noise from bean
Change-Id: Ifc6889ef79bd4002c03006a48149594e0ed6690b
Reviewed-on: https://gerrit.libreoffice.org/8235
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/bean/com/sun/star/beans/LocalOfficeConnection.java
b/bean/com/sun/star/beans/LocalOfficeConnection.java
index d8e7b3b..02a08d0 100644
--- a/bean/com/sun/star/beans/LocalOfficeConnection.java
+++ b/bean/com/sun/star/beans/LocalOfficeConnection.java
@@ -330,7 +330,7 @@ public class LocalOfficeConnection
aExec = OFFICE_APP_NAME + .exe;
// add other non-UNIX operating systems here
-// ...
+
// find soffice executable relative to this class's class loader:
File path = NativeLibraryLoader.getResource(
diff --git a/bean/com/sun/star/beans/LocalOfficeWindow.java
b/bean/com/sun/star/beans/LocalOfficeWindow.java
index 8f79b99..bb58b65 100644
--- a/bean/com/sun/star/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/beans/LocalOfficeWindow.java
@@ -251,7 +251,7 @@ public class LocalOfficeWindow
*/
private native int getNativeWindowSystemType();
-
//---
+
/** Helper class to watch calls into OOo with a timeout.
* @deprecated
*/
diff --git a/bean/com/sun/star/comp/beans/Controller.java
b/bean/com/sun/star/comp/beans/Controller.java
index 9521af6..9e93c58 100644
--- a/bean/com/sun/star/comp/beans/Controller.java
+++ b/bean/com/sun/star/comp/beans/Controller.java
@@ -40,9 +40,9 @@ public class Controller
xController );
}
-//==
+
// com.sun.star.frame.XController
-//--
+
public void attachFrame( /*IN*/ com.sun.star.frame.XFrame xFrame )
{
@@ -79,9 +79,9 @@ public class Controller
return xController.getFrame();
}
-//==
+
// com.sun.star.frame.XDispatchProvider
-//--
+
public com.sun.star.frame.XDispatch queryDispatch(
/*IN*/ com.sun.star.util.URL aURL,
diff --git a/bean/com/sun/star/comp/beans/Frame.java
b/bean/com/sun/star/comp/beans/Frame.java
index b14b633..62affe3 100644
--- a/bean/com/sun/star/comp/beans/Frame.java
+++ b/bean/com/sun/star/comp/beans/Frame.java
@@ -45,9 +45,9 @@ public class Frame
xFrame );
}
-//==
+
// com.sun.star.frame.XFrame
-//--
+
public void initialize( /*IN*/ com.sun.star.awt.XWindow xWindow )
{
@@ -134,9 +134,9 @@ public class Frame
xFrame.removeFrameActionListener( xListener );
}
-//==
+
// com.sun.star.frame.XDispatchProvider
-//--
+
public com.sun.star.frame.XDispatch queryDispatch(
/*IN*/ com.sun.star.util.URL aURL,
@@ -152,9 +152,9 @@ public class Frame
return xDispatchProvider.queryDispatches( aRequests );
}
-//==
+
// com.sun.star.frame.XDispatchProviderInterception
-//--
+
public void registerDispatchProviderInterceptor(
/*IN*/ com.sun.star.frame.XDispatchProviderInterceptor
xInterceptor )
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java
b/bean/com/sun/star/comp/beans/OOoBean.java
index 49bab1b..e5a1102 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1029,7 +1029,7 @@
xLayoutManager.showElement(private:resource/menubar/menubar);
bIgnoreVisibility = false;
}
-
//--
+
/** Applies all tool visiblities to the real thing.
@deprecated Clients should use the service
[Libreoffice-commits] core.git: 2 commits - qadevOOo/tests svtools/source
qadevOOo/tests/java/mod/_forms/GenericModelTest.java |2 +-
qadevOOo/tests/java/mod/_sw/SwXTextView.java |4 ++--
svtools/source/dialogs/wizardmachine.cxx |8
3 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 8e000814efffc504aebb76843ad831ad6b9ee520
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Feb 25 22:10:12 2014 +0100
Typo: folowing - following + elemtens - elements
Change-Id: Ice7ae2e82085ba5f0061ba1a960f693744e45e63
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index 92bdf1d..9fa4f94 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -248,7 +248,7 @@ public class GenericModelTest extends TestCase {
if (myForm == null){
log.println(ERROR: could not get 'Standard' from
drawpage!);
}
-log.println(the draw page contains folowing elemtens:);
+log.println(the draw page contains following elements:);
String[] elements =
FormTools.getForms(WriterTools.getDrawPage(m_xTextDoc)).getElementNames();
for (int i = 0; i elements.length; i++){
log.println(Element[ + i + ] : + elements[i]);
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java
b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
index d1a2d2c..9de1581 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
@@ -245,7 +245,7 @@ public class SwXTextView extends TestCase {
if (xForms == null)
log.println(ERROR: could not get Forms);
-log.println(the draw page contains folowing elemtens:);
+log.println(the draw page contains following elements:);
String[] elements =
FormTools.getForms(WriterTools.getDrawPage(xTextDoc)).getElementNames();
for (int i = 0; i elements.length; i++){
log.println(Element[ + i + ] : + elements[i]);
@@ -255,7 +255,7 @@ public class SwXTextView extends TestCase {
if (myForm == null){
log.println(ERROR: could not get 'Standard' from
drawpage!);
if (debug){
-log.println(the draw page contains folowing elemtens:);
+log.println(the draw page contains following elements:);
//String[] elements =
FormTools.getForms(WriterTools.getDrawPage(xTextDoc)).getElementNames();
//for (int i = 0; i elements.length; i++){
//log.println(Element[ + i + ] : + elements[i]);
commit 88dee977c241a1f6fc42e0153f6a1ba45cec5342
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Feb 25 22:08:09 2014 +0100
Typo: alowed - allowed
Change-Id: I3b02f092e294016a5b50900e94dc1917b6896a6f
diff --git a/svtools/source/dialogs/wizardmachine.cxx
b/svtools/source/dialogs/wizardmachine.cxx
index d05030f..c0fa193 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -444,7 +444,7 @@ namespace svt
sal_Bool OWizardMachine::skipBackwardUntil( WizardState _nTargetState )
{
-// alowed to leave the current page?
+// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelBackward ) )
return sal_False;
@@ -473,7 +473,7 @@ namespace svt
{
WizardState nCurrentState = getCurrentState();
-// alowed to leave the current page?
+// allowed to leave the current page?
if ( !prepareLeaveCurrentState( nCurrentState _nTargetState ?
eTravelForward : eTravelBackward ) )
return sal_False;
@@ -512,7 +512,7 @@ namespace svt
sal_Bool OWizardMachine::skip(sal_Int32 _nSteps)
{
DBG_ASSERT(_nSteps 0, OWizardMachine::skip: invalid number of
steps!);
-// alowed to leave the current page?
+// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelForward ) )
return sal_False;
@@ -578,7 +578,7 @@ namespace svt
{
DBG_ASSERT(m_pImpl-aStateHistory.size() 0,
OWizardMachine::travelPrevious: have no previous page!);
-// alowed to leave the current page?
+// allowed to leave the current page?
if ( !prepareLeaveCurrentState( eTravelBackward ) )
return sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sot/qa sot/source
sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java |2
sot/source/base/factory.cxx |2
sot/source/base/object.cxx|6 +-
sot/source/sdstor/stg.cxx | 10 ++--
sot/source/sdstor/stgavl.cxx |2
sot/source/sdstor/stgcache.cxx|4 -
sot/source/sdstor/stgdir.cxx |4 -
sot/source/sdstor/stgelem.cxx |6 +-
sot/source/sdstor/stgio.cxx |2
sot/source/sdstor/stgole.cxx |6 +-
sot/source/sdstor/stgstrms.cxx| 14 ++---
sot/source/unoolestorage/xolesimplestorage.hxx| 24 +-
12 files changed, 41 insertions(+), 41 deletions(-)
New commits:
commit 614e1a6cf8839344755ea8d5227561f75772aa2a
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 20:40:23 2014 +0100
Remove visual noise from sot
Change-Id: I731691d4cac8567938407a514a25e13b2baa7958
Reviewed-on: https://gerrit.libreoffice.org/8314
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
index 13f6515..58ba596 100644
--- a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
+++ b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
@@ -40,7 +40,7 @@ public class OLESimpleStorageUnitTest /* extends
ComplexTestCase */
//return new String[] {
//ExecuteTest01};
//}
-//
+
//public String getTestObjectName() {
//return OLESimpleStorageUnitTest;
//}
diff --git a/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 0cd94cd..1b28f70 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.cxx
@@ -102,7 +102,7 @@ SotFactory::SotFactory( const SvGlobalName rName,
}
-//=
+
SotFactory::~SotFactory()
{
delete [] pSuperClasses;
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index cd14c74..0730ad5 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.cxx
@@ -72,7 +72,7 @@ IUnknown * SotObject::GetInterface( const SvGlobalName )
return NULL;
}
-//=
+
void SotObject::OwnerLock
(
bool bLock /* true, lock. false, unlock. */
@@ -98,7 +98,7 @@ void SotObject::OwnerLock
}
}
-//=
+
bool SotObject::DoClose()
{
bool bRet = false;
@@ -112,7 +112,7 @@ bool SotObject::DoClose()
return bRet;
}
-//=
+
bool SotObject::Close()
{
return true;
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index 684d36f..6ffb6ba 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.cxx
@@ -41,7 +41,7 @@ static long nTmpCount = 0;
#define INTERNAL_MODE ( STREAM_READ | STREAM_TRUNC )
-/ class StorageBase //
+/ class StorageBase
TYPEINIT0( StorageBase );
TYPEINIT1( BaseStorageStream, StorageBase );
@@ -159,7 +159,7 @@ bool OLEStorageBase::ValidateMode_Impl( StreamMode m,
StgDirEntry* p ) const
}
- class StorageStream /
+ class StorageStream
TYPEINIT1( StorageStream, BaseStorageStream );
@@ -319,7 +319,7 @@ bool StorageStream::ValidateMode( StreamMode nMode ) const
return bRet;
}
-/ class SvStorageInfo //
+/ class SvStorageInfo
SvStorageInfo::SvStorageInfo( const StgDirEntry rE )
{
@@ -329,7 +329,7 @@ SvStorageInfo::SvStorageInfo( const StgDirEntry rE )
nSize= bStorage ? 0 : rE.aEntry.GetSize();
}
-/// class Storage
+/// class Storage
bool Storage::IsStorageFile( const OUString rFileName )
{
@@ -927,7 +927,7 @@ bool Storage::Revert()
return true;
}
-/ OLE Support
+/ OLE Support
// Set the storage type
diff --git a/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx
index 807f023..722fb25 100644
--- a/sot/source/sdstor/stgavl.cxx
+++ b/sot/source/sdstor/stgavl.cxx
@@ -380,7 +380,7 @@ bool StgAvlNode::Move( StgAvlNode** pRoot1, StgAvlNode**
pRoot2, StgAvlNode* pMo
return false;
}
-// class
[Libreoffice-commits] core.git: svtools/source
svtools/source/contnr/svlbitm.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 554fbe94fc098b1d0c588a8b29077555be192e97 Author: Caolán McNamara caol...@redhat.com Date: Tue Feb 25 21:14:43 2014 + fix comments Change-Id: I79f827b361d0afe2e9c436d3fb29847b9aaa981d diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 6f4ad35..c759d06 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -383,9 +383,7 @@ void SvLBoxButton::Paint( sal_uInt16 nStyle = eKind != SvLBoxButtonKind_disabledCheckbox rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE; -/ -//Native drawing -/ +//Native drawing sal_Bool bNativeOK = sal_False; ControlType eCtrlType = (pData-IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX; if ( nIndex != SV_BMP_STATICIMAGE rDev.IsNativeControlSupported( eCtrlType, PART_ENTIRE_CONTROL) ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/dockmgr.cxx | 93 +++---
1 file changed, 7 insertions(+), 86 deletions(-)
New commits:
commit d5688e16e72aea26b2bf281efc71e9fadf74944c
Author: Christian M. Heller christian.helle...@gmail.com
Date: Sat Feb 22 07:46:15 2014 -0500
fdo#39468 Translate German Comments - vcl/source/window/dockmgr.cxx
Conflicts:
vcl/source/window/dockmgr.cxx
Change-Id: I0af8a95eab8b05752bb4497295d26b717021d3fd
Reviewed-on: https://gerrit.libreoffice.org/8169
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 0e80b6d..fc865cd 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -37,14 +37,8 @@
#include vcl/settings.hxx
-// ===
-
#define DOCKWIN_FLOATSTYLES (WB_SIZEABLE | WB_MOVEABLE | WB_CLOSEABLE
| WB_STANDALONE | WB_PINABLE | WB_ROLLABLE )
-// ===
-
-
-// ===
class ImplDockFloatWin2 : public FloatingWindow
{
@@ -81,7 +75,6 @@ public:
sal_uLong GetLastTicks() const { return mnLastTicks; }
};
-// ===
ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent, WinBits nWinBits,
ImplDockingWindowWrapper* pDockingWin ) :
@@ -91,7 +84,7 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent,
WinBits nWinBits,
mbInMove( false ),
mnLastUserEvent( 0 )
{
-// Daten vom DockingWindow uebernehmen
+// copy state of DockingWindow
if ( pDockingWin )
{
SetSettings( pDockingWin-GetWindow()-GetSettings() );
@@ -110,16 +103,12 @@ ImplDockFloatWin2::ImplDockFloatWin2( Window* pParent,
WinBits nWinBits,
maEndDockTimer.SetTimeout( 50 );
}
-
-
ImplDockFloatWin2::~ImplDockFloatWin2()
{
if( mnLastUserEvent )
Application::RemoveUserEvent( mnLastUserEvent );
}
-
-
IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
{
DBG_ASSERT( mpDockWin-IsFloatingMode(), docktimer called but not
floating );
@@ -264,8 +253,6 @@ void ImplDockFloatWin2::Move()
mnLastUserEvent = Application::PostUserEvent( LINK( this,
ImplDockFloatWin2, DockingHdl ) );
}
-
-
void ImplDockFloatWin2::Resize()
{
// forwarding of resize only required if we have no borderwindow (
GetWindow() then returns 'this' )
@@ -273,7 +260,7 @@ void ImplDockFloatWin2::Resize()
{
FloatingWindow::Resize();
Size aSize( GetSizePixel() );
-mpDockWin-GetWindow()-ImplPosSizeWindow( 0, 0, aSize.Width(),
aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // is this needed ???
+mpDockWin-GetWindow()-ImplPosSizeWindow( 0, 0, aSize.Width(),
aSize.Height(), WINDOW_POSSIZE_POSSIZE ); // TODO: is this needed ???
}
}
@@ -284,55 +271,41 @@ void ImplDockFloatWin2::setPosSizePixel( long nX, long nY,
FloatingWindow::setPosSizePixel( nX, nY, nWidth, nHeight, nFlags );
}
-
-
-
void ImplDockFloatWin2::TitleButtonClick( sal_uInt16 nButton )
{
FloatingWindow::TitleButtonClick( nButton );
mpDockWin-TitleButtonClick( nButton );
}
-
-
void ImplDockFloatWin2::Pin()
{
FloatingWindow::Pin();
mpDockWin-Pin();
}
-
-
void ImplDockFloatWin2::Roll()
{
FloatingWindow::Roll();
mpDockWin-Roll();
}
-
-
void ImplDockFloatWin2::PopupModeEnd()
{
FloatingWindow::PopupModeEnd();
mpDockWin-PopupModeEnd();
}
-
-
void ImplDockFloatWin2::Resizing( Size rSize )
{
FloatingWindow::Resizing( rSize );
mpDockWin-Resizing( rSize );
}
-
-
bool ImplDockFloatWin2::Close()
{
return mpDockWin-Close();
}
-// ===
DockingManager::DockingManager()
{
@@ -437,8 +410,6 @@ bool DockingManager::IsInPopupMode( const Window *pWindow )
return false;
}
-
-
void DockingManager::EndPopupMode( const Window *pWin )
{
ImplDockingWindowWrapper *pWrapper = GetDockingWindowWrapper( pWin );
@@ -446,8 +417,6 @@ void DockingManager::EndPopupMode( const Window *pWin )
pWrapper-GetFloatingWindow()-EndPopupMode();
}
-
-
void DockingManager::AddWindow( const Window *pWindow )
{
ImplDockingWindowWrapper* pWrapper = GetDockingWindowWrapper( pWindow );
@@ -838,8 +807,6 @@ void ImplPopupFloatWin::Tracking( const TrackingEvent
rTEvt )
}
-// ===
-
ImplDockingWindowWrapper::ImplDockingWindowWrapper( const Window *pWindow )
{
ImplInitData();
@@ -866,8 +833,6 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
}
}
-
-
bool ImplDockingWindowWrapper::ImplStartDocking( const Point rPos )
[Bug 39468] translate German comments, removing redundant ones
https://bugs.freedesktop.org/show_bug.cgi?id=39468 --- Comment #106 from Commit Notification libreoffice-comm...@lists.freedesktop.org --- Christian M. Heller committed a patch related to this issue. It has been pushed to master: http://cgit.freedesktop.org/libreoffice/core/commit/?id=d5688e16e72aea26b2bf281efc71e9fadf74944c fdo#39468 Translate German Comments - vcl/source/window/dockmgr.cxx The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- 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: svl/qa svl/source
svl/qa/complex/ConfigItems/CheckConfigItems.java | 28 ++--
svl/source/inc/poolio.hxx|2
svl/source/items/cenumitm.cxx| 12 ++---
svl/source/items/cintitem.cxx| 16 +++
svl/source/items/ctypeitm.cxx|4 -
svl/source/items/custritm.cxx|4 -
svl/source/items/intitem.cxx | 24 +--
svl/source/items/stritem.cxx |4 -
svl/source/items/style.cxx |2
svl/source/items/visitem.cxx |4 -
svl/source/misc/adrparse.cxx |8 +--
svl/source/misc/inettype.cxx |8 +--
svl/source/misc/mediatyp.src |8 +--
svl/source/misc/strmadpt.cxx | 20 -
svl/source/misc/urihelper.cxx| 50 +++
svl/source/numbers/zforlist.cxx |4 -
svl/source/svdde/ddeimp.hxx | 16 +++
17 files changed, 107 insertions(+), 107 deletions(-)
New commits:
commit 31ea60c882cd9e0ce042f2d2945c711bffc93f18
Author: Alexander Wilms f.alexander.wi...@gmail.com
Date: Tue Feb 25 20:44:28 2014 +0100
Remove visual noise from svl
Change-Id: Ib914ec8d161e24f4e3e1fb8e7684a780d3ae6209
Reviewed-on: https://gerrit.libreoffice.org/8319
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/svl/qa/complex/ConfigItems/CheckConfigItems.java
b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index 292ec46..73ca7b7 100644
--- a/svl/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
@@ -32,16 +32,16 @@ import org.junit.Test;
import org.openoffice.test.OfficeConnection;
// import static org.junit.Assert.*;
-//---
+
/** @short todo document me
* @deprecated this tests seems no longer work as expected.
*/
public class CheckConfigItems
{
-//---
+
// some const
-//---
+
// member
/** points to the global uno service manager. */
@@ -50,10 +50,10 @@ public class CheckConfigItems
/** implements real config item tests in C++. */
private XJob m_xTest = null;
-//---
+
// test environment
-//---
+
/** @short A function to tell the framework,
which test functions are available.
@@ -73,7 +73,7 @@ public class CheckConfigItems
//};
//}
-//---
+
/** @short Create the environment for following tests.
* @throws java.lang.Exception
@@ -92,7 +92,7 @@ public class CheckConfigItems
m_xTest = UnoRuntime.queryInterface(XJob.class,
m_xSmgr.createInstance(com.sun.star.comp.svl.ConfigItemTest));
}
-//---
+
/**
* @throws java.lang.Exception
* @short close the environment.
@@ -106,7 +106,7 @@ public class CheckConfigItems
m_xSmgr = null;
}
-//---
+
/**
* @throws java.lang.Exception
* @todo document me
@@ -117,7 +117,7 @@ public class CheckConfigItems
impl_triggerTest(checkPicklist);
}
-//---
+
/**
* @throws java.lang.Exception
* @todo document me
@@ -128,7 +128,7 @@ public class CheckConfigItems
impl_triggerTest(checkURLHistory);
}
-//---
+
/**
* @throws java.lang.Exception
* @todo document me
@@ -139,7 +139,7 @@ public class CheckConfigItems
impl_triggerTest(checkHelpBookmarks);
}
-//---
+
/**
* @throws java.lang.Exception
* @todo document me
@@ -150,7 +150,7 @@ public class CheckConfigItems
// impl_triggerTest(checkPrintOptions);
// }
-//---
+
/**
* @throws java.lang.Exception
* @todo document me
@@ -161,7 +161,7 @@ public class CheckConfigItems
impl_triggerTest(checkAccessibilityOptions);
}
-//---
+
/**
* @throws java.lang.Exception
* @todo document me
@@ -172,7 +172,7 @@ public class CheckConfigItems
impl_triggerTest(checkUserOptions);
}
-//---
+
/** @todo document me
*/
private void impl_triggerTest(String sTest)
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index de90d0b..9fa2dac 100644
--- a/svl/source/inc/poolio.hxx
+++
[Libreoffice-commits] core.git: sw/source
sw/source/filter/html/css1atr.cxx | 253 --
sw/source/filter/html/htmlatr.cxx | 75 ---
2 files changed, 142 insertions(+), 186 deletions(-)
New commits:
commit 5dee438cc2f1dc48c7bcca963f17dc797e8fb0fe
Author: Jan Holesovsky ke...@collabora.com
Date: Tue Feb 25 22:07:44 2014 +0100
html: Another problem caused by lowercasing the tags.
Let's convert the switches to full comprison; it's future-proof, and the
performance difference here is not critical.
Change-Id: I1541acdc89312806f4bf05226efb3a42e81f8019
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 222fd21..972152d 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -670,134 +670,107 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt
*pFmt, OString rToken,
if( USER_FMT nPoolId )
{
// Benutzer-Vorlagen
-const OUString aNm = pPFmt-GetName();
-switch( aNm[0] )
+const OUString aNm(pPFmt-GetName());
+
+if (!bChrFmt aNm == OOO_STRING_SVTOOLS_HTML_blockquote)
{
-// nicht mehr unterstuetzt:
-// OOO_STRING_SVTOOLS_HTML_author
-// OOO_STRING_SVTOOLS_HTML_acronym
-// OOO_STRING_SVTOOLS_HTML_abbreviation
-// OOO_STRING_SVTOOLS_HTML_deletedtext
-// OOO_STRING_SVTOOLS_HTML_insertedtext
-// OOO_STRING_SVTOOLS_HTML_language
-// OOO_STRING_SVTOOLS_HTML_person
-case 'B': if( !bChrFmt aNm ==
OOO_STRING_SVTOOLS_HTML_blockquote )
-{
-rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
-rToken =
OString(OOO_STRING_SVTOOLS_HTML_blockquote);
-}
-break;
-case 'C': if( bChrFmt )
-{
-if( aNm == OOO_STRING_SVTOOLS_HTML_citiation )
-{
-rRefPoolId = RES_POOLCHR_HTML_CITIATION;
-rToken =
OString(OOO_STRING_SVTOOLS_HTML_citiation);
-}
-else if( aNm == OOO_STRING_SVTOOLS_HTML_code )
-{
-rRefPoolId = RES_POOLCHR_HTML_CODE;
-rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
-}
-}
-break;
-case 'D': if( bChrFmt aNm ==
OOO_STRING_SVTOOLS_HTML_definstance )
-{
-rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
-rToken =
OString(OOO_STRING_SVTOOLS_HTML_definstance);
-}
-else if( !bChrFmt )
-{
-sal_uInt16 nDefListLvl = GetDefListLvl( aNm,
nPoolId );
-// Die Vorlagen DD 1/DT 1 werden ausgegeben,
-// aber keine von ihnen abgeleiteten Vorlagen,
-// auch nicht DD 2/DT 2 etc.
-if( nDefListLvl )
-{
-if( pPseudo
-(nDeep || (nDefListLvl 0x0fff) 1) )
-{
-bStop = true;
-}
-else if( nDefListLvl HTML_DLCOLL_DD )
-{
-rRefPoolId = RES_POOLCOLL_HTML_DD;
-rToken =
OString(OOO_STRING_SVTOOLS_HTML_dd);
-}
-else
-{
-rRefPoolId = RES_POOLCOLL_HTML_DT;
-rToken =
OString(OOO_STRING_SVTOOLS_HTML_dt);
-}
-}
-}
-break;
-case 'E': if( bChrFmt aNm == OOO_STRING_SVTOOLS_HTML_emphasis
)
-{
-rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
-rToken = OString(OOO_STRING_SVTOOLS_HTML_emphasis);
-}
-break;
-case 'H': if( !bChrFmt aNm ==
OOO_STRING_SVTOOLS_HTML_horzrule )
-// HR nicht ausgeben!
-bStop = (nDeep==0);
-break;
-case 'K': if( bChrFmt aNm == OOO_STRING_SVTOOLS_HTML_keyboard
)
-{
-
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source
i18nlangtag/source/isolang/isolang.cxx |1 +
include/i18nlangtag/lang.h |1 +
svtools/source/misc/langtab.src|1 +
3 files changed, 3 insertions(+)
New commits:
commit da4a8dbb1057acd0bdc18b3aa97b7f378ac19b31
Author: Eike Rathke er...@redhat.com
Date: Tue Feb 25 22:39:32 2014 +0100
added Maninkakan, Eastern, Latin [emk-Latn-GN], fdo#74672
Change-Id: Ib75136c6f0604cb6e3125e39a1514bbcc9ade079
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 57690c0..12f3831 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -720,6 +720,7 @@ static IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_BOSNIAN_LATIN_BOSNIA_HERZEGOVINA,bs-Latn, BA, kSAME },
// MS, though Latn is suppress-script
{ LANGUAGE_BOSNIAN_LATIN_LSO, bs-Latn, ,
LANGUAGE_BOSNIAN_LSO }, // MS, though Latn is suppress-script
{ LANGUAGE_CHINESE_TRADITIONAL_LSO, zh-Hant, , 0 },
+{ LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN, emk-Latn, GN, 0 },
{ LANGUAGE_DONTKNOW,, , 0 }
// marks end of table
};
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index f936fce..ab7ba7a 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -693,6 +693,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_TIBETAN_BHUTAN0x8451 /* makeLangID( 0x21,
getPrimaryLanguage( LANGUAGE_TIBETAN)) */
#define LANGUAGE_USER_FRENCH_BURKINA_FASO 0x800C /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_FRENCH)) */
#define LANGUAGE_USER_PUINAVE 0x068E
+#define LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN 0x068F
/* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 341fa4a..ad9201f 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -378,6 +378,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
Ladin ; LANGUAGE_USER_LADIN ; ;
French (Burkina Faso) ; LANGUAGE_USER_FRENCH_BURKINA_FASO ; ;
Puinave ; LANGUAGE_USER_PUINAVE ; ;
+ Maninkakan, Eastern, Latin ;
LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ; ;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source
i18nlangtag/source/isolang/isolang.cxx |1 +
include/i18nlangtag/lang.h |1 +
svtools/source/misc/langtab.src|1 +
3 files changed, 3 insertions(+)
New commits:
commit 9c2515f8e05c44b74ab2887cceaade0c4d87446a
Author: Eike Rathke er...@redhat.com
Date: Tue Feb 25 23:50:31 2014 +0100
added Avar [av-RU], fdo#75161
Change-Id: Id8e32dab357d0eda90d36ab4e53f3eb2da769029
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index 12f3831..f388e7f 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -642,6 +642,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_LADIN, lld, IT, 0 },
{ LANGUAGE_USER_FRENCH_BURKINA_FASO,fr, BF, 0 },
{ LANGUAGE_USER_PUINAVE, pui, CO, 0 },
+{ LANGUAGE_USER_AVAR, av, RU, 0 },
{ LANGUAGE_MULTIPLE, mul, , 0 },//
multiple languages, many languages are used
{ LANGUAGE_UNDETERMINED, und, , 0 },//
undetermined language, language cannot be identified
{ LANGUAGE_NONE, zxx, , 0 },// added
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ab7ba7a..b36acd4 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -694,6 +694,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_FRENCH_BURKINA_FASO 0x800C /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_FRENCH)) */
#define LANGUAGE_USER_PUINAVE 0x068E
#define LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN 0x068F
+#define LANGUAGE_USER_AVAR 0x0690
/* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index ad9201f..df3d008 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -379,6 +379,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
French (Burkina Faso) ; LANGUAGE_USER_FRENCH_BURKINA_FASO ; ;
Puinave ; LANGUAGE_USER_PUINAVE ; ;
Maninkakan, Eastern, Latin ;
LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ; ;
+ Avar ; LANGUAGE_USER_AVAR ; ;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/msfilter/mscodec.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2d3ed7ebb592401de214eaeee68c656afbefbe05 Author: Michael Meeks michael.me...@collabora.com Date: Tue Feb 25 22:48:48 2014 + cid#736173 - increase default fill chars buffer size. Change-Id: Ib7ae9b0a0cddd070372a244cf705f71b6e793473 diff --git a/filter/source/msfilter/mscodec.cxx b/filter/source/msfilter/mscodec.cxx index eb5ea4c..8f14db6 100644 --- a/filter/source/msfilter/mscodec.cxx +++ b/filter/source/msfilter/mscodec.cxx @@ -144,7 +144,7 @@ void MSCodec_Xor95::InitKey( const sal_uInt8 pnPassData[ 16 ] ) 0xBB, 0xFF, 0xFF, 0xBA, 0xFF, 0xFF, 0xB9, 0x80, 0x00, 0xBE, 0x0F, 0x00, -0xBF, 0x0F, 0x00 +0xBF, 0x0F, 0x00, 0x00 }; sal_Size nIndex; ___ 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-2' - sc/source
sc/source/filter/excel/xestyle.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit a09cedbcea86e0af0db1ced6df6cf95ab5ba946b
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Feb 20 11:27:32 2014 -0500
fdo#75130: Export cell borders to xls and xlsx correctly.
Change-Id: Ic629fb4852d2ada9724dfee7618e2436c0fa28a8
(cherry picked from commit 1c1f42fdbad774cae7c45a7f8d60b9af766dee0a)
Reviewed-on: https://gerrit.libreoffice.org/8147
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-on: https://gerrit.libreoffice.org/8152
Reviewed-by: Michael Stahl mst...@redhat.com
Reviewed-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Christian Lohmaier lohmaier+libreoff...@googlemail.com
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 59603eb..f3ce557 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -1570,18 +1570,18 @@ void lclGetBorderLine(
switch (pLine-GetBorderLineStyle())
{
case table::BorderLineStyle::DASHED:
+case table::BorderLineStyle::FINE_DASHED:
rnXclLine = EXC_LINE_DASHED;
break;
case table::BorderLineStyle::DOTTED:
rnXclLine = EXC_LINE_DOTTED;
break;
-case table::BorderLineStyle::FINE_DASHED:
-rnXclLine = EXC_LINE_HAIR;
-break;
default:
break;
}
}
+else if (nOuterWidth = EXC_BORDER_HAIR)
+rnXclLine = EXC_LINE_HAIR;
else
rnXclLine = EXC_LINE_NONE;
}
@@ -1726,7 +1726,7 @@ static const char* ToLineStyle( sal_uInt8 nLineStyle )
case EXC_LINE_HAIR: return hair;
case EXC_LINE_DOTTED: return dotted;
case EXC_LINE_DASHED: return dashed;
-case EXC_LINE_MEDIUMDASHED: return mediumdashed;
+case EXC_LINE_MEDIUMDASHED: return mediumDashed;
}
return *unknown*;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/source
i18nlangtag/source/isolang/isolang.cxx |2 ++
include/i18nlangtag/lang.h |2 ++
svtools/source/misc/langtab.src|2 ++
3 files changed, 6 insertions(+)
New commits:
commit 75a22a9fb88b128bb31eb51dc763e42cb76e26c2
Author: Eike Rathke er...@redhat.com
Date: Wed Feb 26 00:12:29 2014 +0100
added Cree, Plains, Latin [crk-Latn-CN] and Syllabics [crk-Cans-CN],
fdo#73973
Change-Id: I66b2923a59e06c5798d8debb14eb2282c9a4fb1d
diff --git a/i18nlangtag/source/isolang/isolang.cxx
b/i18nlangtag/source/isolang/isolang.cxx
index f388e7f..95f01ca 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -722,6 +722,8 @@ static IsoLanguageScriptCountryEntry const
aImplIsoLangScriptEntries[] =
{ LANGUAGE_BOSNIAN_LATIN_LSO, bs-Latn, ,
LANGUAGE_BOSNIAN_LSO }, // MS, though Latn is suppress-script
{ LANGUAGE_CHINESE_TRADITIONAL_LSO, zh-Hant, , 0 },
{ LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN, emk-Latn, GN, 0 },
+{ LANGUAGE_USER_CREE_PLAINS_LATIN, crk-Latn, CN, 0 },
+{ LANGUAGE_USER_CREE_PLAINS_SYLLABICS, crk-Cans, CN, 0 },
{ LANGUAGE_DONTKNOW,, , 0 }
// marks end of table
};
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index b36acd4..33c6a84 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -695,6 +695,8 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_PUINAVE 0x068E
#define LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN 0x068F
#define LANGUAGE_USER_AVAR 0x0690
+#define LANGUAGE_USER_CREE_PLAINS_LATIN 0x0691
+#define LANGUAGE_USER_CREE_PLAINS_SYLLABICS 0x8291 /* makeLangID( 0x20,
getPrimaryLanguage( LANGUAGE_USER_CREE_PLAINS_LATIN)) */
/* Primary language ID range for on-the-fly assignment. */
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index df3d008..99a62f7 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -380,6 +380,8 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
Puinave ; LANGUAGE_USER_PUINAVE ; ;
Maninkakan, Eastern, Latin ;
LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN ; ;
Avar ; LANGUAGE_USER_AVAR ; ;
+ Cree, Plains, Latin ; LANGUAGE_USER_CREE_PLAINS_LATIN ; ;
+ Cree, Plains, Syllabics ; LANGUAGE_USER_CREE_PLAINS_SYLLABICS ; ;
};
};
___
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/linkuno.hxx |6 --
sc/qa/unit/data/ods/external-ref-cache.ods |binary
sc/qa/unit/subsequent_filters-test.cxx | 17 +
sc/source/filter/xml/xmlexternaltabi.cxx |8 +++-
sc/source/ui/unoobj/linkuno.cxx| 26 --
5 files changed, 44 insertions(+), 13 deletions(-)
New commits:
commit 5706ff70dbb18d03e396fd484bd1392dbcefb6c7
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Tue Feb 25 20:40:04 2014 -0500
fdo#72041: Intern strings as we populate the external cache.
This commit covers ods import and UNO API layer.
Change-Id: I3ad1b7cfefe49575694e2351bcba6e5733b009d2
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index aa6a2dc..e079e75 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -502,7 +502,7 @@ public:
class ScExternalSheetCacheObj : public cppu::WeakImplHelper1
::com::sun::star::sheet::XExternalSheetCache
{
public:
-explicit ScExternalSheetCacheObj(ScExternalRefCache::TableTypeRef pTable,
size_t nIndex);
+explicit ScExternalSheetCacheObj(ScDocShell* pDocShell,
ScExternalRefCache::TableTypeRef pTable, size_t nIndex);
~ScExternalSheetCacheObj();
// XExternalSheetCache
@@ -528,6 +528,7 @@ private:
ScExternalSheetCacheObj(const ScExternalSheetCacheObj);
private:
+ScDocShell* mpDocShell;
ScExternalRefCache::TableTypeRef mpTable;
size_t mnIndex;
};
@@ -535,7 +536,7 @@ private:
class ScExternalDocLinkObj : public cppu::WeakImplHelper1
::com::sun::star::sheet::XExternalDocLink
{
public:
-ScExternalDocLinkObj(ScExternalRefManager* pRefMgr, sal_uInt16 nFileId);
+ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr,
sal_uInt16 nFileId);
~ScExternalDocLinkObj();
// XExternalDocLink
@@ -574,6 +575,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
private:
+ScDocShell* mpDocShell;
ScExternalRefManager* mpRefMgr;
sal_uInt16 mnFileId;
};
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx
b/sc/source/filter/xml/xmlexternaltabi.cxx
index d4ef04e..c34b622 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -24,7 +24,9 @@
#include token.hxx
#include document.hxx
+#include documentimport.hxx
+#include svl/sharedstringpool.hxx
#include xmloff/nmspmap.hxx
#include xmloff/xmlnmspe.hxx
#include xmloff/xmltoken.hxx
@@ -376,7 +378,11 @@ void ScXMLExternalRefCellContext::EndElement()
if (mbIsNumeric)
aToken.reset(new formula::FormulaDoubleToken(mfCellValue));
else
-aToken.reset(new formula::FormulaStringToken(maCellString));
+{
+ScDocument rDoc = mrScImport.GetDoc().getDoc();
+svl::SharedString aSS =
rDoc.GetSharedStringPool().intern(maCellString);
+aToken.reset(new formula::FormulaStringToken(aSS));
+}
sal_uInt32 nNumFmt = mnNumberFormat = 0 ?
static_castsal_uInt32(mnNumberFormat) : 0;
mrExternalRefInfo.mpCacheTable-setCell(
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 9bba5ba..a47032e 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -20,6 +20,7 @@
#include svl/smplhint.hxx
#include sfx2/linkmgr.hxx
#include vcl/svapp.hxx
+#include svl/sharedstringpool.hxx
#include linkuno.hxx
#include miscuno.hxx
@@ -1471,7 +1472,8 @@ uno::Reference sheet::XDDELink
ScDDELinksObj::addDDELink(
//
-ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScExternalRefCache::TableTypeRef
pTable, size_t nIndex) :
+ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScDocShell* pDocShell,
ScExternalRefCache::TableTypeRef pTable, size_t nIndex) :
+mpDocShell(pDocShell),
mpTable(pTable),
mnIndex(nIndex)
{
@@ -1494,7 +1496,11 @@ void SAL_CALL
ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR
if (rValue = fVal)
pToken.reset(new FormulaDoubleToken(fVal));
else if (rValue = aVal)
-pToken.reset(new FormulaStringToken(aVal));
+{
+svl::SharedStringPool rPool =
mpDocShell-GetDocument()-GetSharedStringPool();
+svl::SharedString aSS = rPool.intern(aVal);
+pToken.reset(new FormulaStringToken(aSS));
+}
else
// unidentified value type.
return;
@@ -1573,8 +1579,8 @@ sal_Int32 SAL_CALL
ScExternalSheetCacheObj::getTokenIndex()
//
-ScExternalDocLinkObj::ScExternalDocLinkObj(ScExternalRefManager* pRefMgr,
sal_uInt16 nFileId) :
-mpRefMgr(pRefMgr), mnFileId(nFileId)
+ScExternalDocLinkObj::ScExternalDocLinkObj(ScDocShell* pDocShell,
ScExternalRefManager* pRefMgr, sal_uInt16 nFileId) :
+
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||37223 -- 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
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 --- Comment #145 from Joel Madero jmadero@gmail.com --- Nominated bug 37223 - Impossible to copy just values from spreadsheet into a table in Writer - inherited by OOo but quite annoying. a couple dupes and a few users involved. Plus I guess it was reported during OOo days and had 100+ votes on their infra. -- 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
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on||74087 -- 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
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #103 from Joel Madero jmadero@gmail.com --- Nominated bug 74087 - when misspelled word is in a cell, right clicking in the cell goes into edit the cell vs. opening the context menu, offering word suggestions, etc . . . -- 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
