[Libreoffice-commits] core.git: Branch 'aoo/trunk' - set_soenv.in
set_soenv.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22922b027b97cbd7df967f6a8ae26e8b6f7fc2e1 Author: Kay Schenk <ksch...@apache.org> Date: Sat Aug 27 00:11:53 2016 + Commented out reference to HAMCREST_CORE_JAR since it is not used in current configure.ac. diff --git a/set_soenv.in b/set_soenv.in index 52868de..0d8aa6a 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1650,7 +1650,7 @@ ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" ); ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" ); ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" ); ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@","e" ); -ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" ); +# ToFile( "HAMCREST_CORE_JAR", "@HAMCREST_CORE_JAR@","e" ); ToFile( "SAC_JAR", "@SAC_JAR@", "e" ); ToFile( "LIBXML_JAR","@LIBXML_JAR@", "e" ); ToFile( "FLUTE_JAR", "@FLUTE_JAR@","e" ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bootstrap.1
bootstrap.1 |2 ++ 1 file changed, 2 insertions(+) New commits: commit a4c7ead4ac16db5c3f89cabb62a9727ae48a079e Author: Kay Schenk <ksch...@apache.org> Date: Tue Jun 21 21:23:37 2016 + Output Perl @INC, library locations, to help troubleshoot missing Perl modules. diff --git a/bootstrap.1 b/bootstrap.1 index 572a2e8..0981e5f 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -39,6 +39,8 @@ chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl" # fetch or update external tarballs if [ "$DO_FETCH_TARBALLS" = "yes" ]; then +# check perl include locations +"$PERL" -e 'print "\nInclude locations: @INC\n\n"'; "$PERL" "$SOLARENV/bin/download_external_dependencies.pl" $SRC_ROOT/external_deps.lst if [ "$?" != "0" ]; then echo "*** Error downloading external dependencies, please fix the previous problems and try again ***" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/UnoControlFixedTextModel.idl |7 +++ 1 file changed, 7 insertions(+) New commits: commit 38c14a06c1603c73b7fc32f7a92d48238553bd18 Author: Kay Schenk <ksch...@apache.org> Date: Sun Feb 14 21:45:01 2016 + Related: #i126658# Add description about NoLabel property... on css.awt.UnoControlFixedTextModel Patch by: hanya (cherry picked from commit 92ff48eb981610cb1565cd5472a6714feb7f68a6) Change-Id: I44bbf7d49add8e49d3cb8e1a19839626a2f69b63 diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl index 5b0963a..ed9a941 100644 --- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl +++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl @@ -136,6 +136,13 @@ published service UnoControlFixedTextModel */ [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign; +//- + +/** supresses automatic accelerator assignment on this control. + +@since OOo 2.4 + */ +[optional, property] boolean NoLabel; }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - autodoc/source offapi/com sw/source
autodoc/source/display/idl/hfi_hierarchy.cxx |6 +++---
offapi/com/sun/star/awt/UnoControlFixedTextModel.idl |7 +++
sw/source/core/doc/poolfmt.cxx |3 +--
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 92ff48eb981610cb1565cd5472a6714feb7f68a6
Author: Kay Schenk <ksch...@apache.org>
Date: Sun Feb 14 21:45:01 2016 +
#i126658# Add description about NoLabel property on
css.awt.UnoControlFixedTextModel
Patch by: hanya
diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index 9bc7a99..a6cbd30 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -169,6 +169,13 @@ published service UnoControlFixedTextModel
*/
[optional, property] com::sun::star::style::VerticalAlignment
VerticalAlign;
+//-
+
+/** supresses automatic accelerator assignment on this control.
+
+@since OpenOffice 2.4
+ */
+[optional, property] boolean NoLabel;
};
//=
commit 257406d5794770d8c07c263b7d043fda944da07a
Author: Kay Schenk <ksch...@apache.org>
Date: Sun Feb 14 21:38:20 2016 +
#i126652# [Autodoc] Numeric character reference should ends with a
semicolon
Patch by: hanya
diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx
b/autodoc/source/display/idl/hfi_hierarchy.cxx
index 206e126..119084b 100644
--- a/autodoc/source/display/idl/hfi_hierarchy.cxx
+++ b/autodoc/source/display/idl/hfi_hierarchy.cxx
@@ -163,16 +163,16 @@ Write_Bases( csi::xml::Element &o_out,
for (uintt i = 0; i < io_setColumns.size(); ++i)
{
if (io_setColumns[i] == 1)
-o_out << new csi::xml::XmlCode("");
+o_out << new csi::xml::XmlCode("");
else
o_out << " ";
o_out << " ";
}
if (bThereComesMore)
-o_out << new csi::xml::XmlCode("");
+o_out << new csi::xml::XmlCode("");
else
-o_out << new csi::xml::XmlCode("");
+o_out << new csi::xml::XmlCode("");
o_out << " ";
HF_IdlTypeText
commit 334f028219a004408695d6c099a543dc1f07
Author: Kay Schenk <ksch...@apache.org>
Date: Sun Feb 14 21:07:39 2016 +
#i126635# Possible null pointer reference
patch by: orcmid
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 4467076..40d5de1 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -300,8 +300,7 @@ void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
rSet.Put( aLR );
rSet.Put( aUL );
-if( !pColl )
-pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( nNxt ));
+pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( nNxt ));
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk.mk
vcl/Library_vcl.mk |5 +++-- vcl/Library_vclplug_gen.mk |2 +- vcl/Library_vclplug_gtk.mk |2 +- 3 files changed, 5 insertions(+), 4 deletions(-) New commits: commit 62be661944e18f630cd7ca3a688bfb02f8dee3f5 Author: Kay Schenk <ksch...@apache.org> Date: Fri Feb 5 18:05:05 2016 + #i126118# More fixes for null second op in ifndef statements. diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 75a6346..ff40252 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\ -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ )) -ifneq ($(ENABLE_DBUS),) +ifeq ($(ENABLE_DBUS),TRUE) $(eval $(call gb_Library_set_include,vclplug_gtk,\ $$(INCLUDE) \ $(shell pkg-config --cflags-only-I dbus-glib-1) \ commit 3ba2da6418ef50d77ce55b859f63bcbc8a973bb7 Author: Kay Schenk <ksch...@apache.org> Date: Fri Feb 5 18:03:36 2016 + #i126118# More changes to fix null operands in ifndef statements. diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index eeebe12..bd2826a 100755 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -116,7 +116,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ ## handle RandR -ifneq ($(ENABLE_RANDR),) +ifeq ($(ENABLE_RANDR),TRUE) $(eval $(call gb_Library_set_defs,vclplug_gen,\ $$(DEFS) \ -DUSE_RANDR \ commit 476fd8ac05f0331e9d67dcf2eaa96e1a8b75bbbd Author: Kay Schenk <ksch...@apache.org> Date: Fri Feb 5 18:01:59 2016 + #i126118# more changes to fix null second op in ifndef statements. diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 70eb695..bcc51dd 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -191,13 +191,13 @@ $(eval $(call gb_Library_set_defs,vcl,\ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \ )) ## handle fontconfig -ifneq ($(ENABLE_FONTCONFIG),) +ifeq ($(ENABLE_FONTCONFIG),TRUE) $(eval $(call gb_Library_set_defs,vcl,\ $$(DEFS) \ -DENABLE_FONTCONFIG \ )) ## handle CUPS -ifneq ($(ENABLE_CUPS),) +ifeq ($(ENABLE_CUPS),TRUE) $(eval $(call gb_Library_set_defs,vcl,\ $$(DEFS) \ -DENABLE_CUPS \ @@ -522,6 +522,7 @@ $(eval $(call gb_Library_set_ldflags,vcl,\ -framework Carbon \ -framework CoreFoundation \ )) +# ??? what about this ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7) $(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: lingucomponent/source
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 6691d78f1df044877fdfa30dd08f0821569efc92
Author: Kay Schenk <ksch...@apache.org>
Date: Thu Jan 28 22:19:30 2016 +
Resolves: #i126762# Ignore dictionary not in specified location.
Damaged "registrymodifications.xcu" causing problems with backups and spell
checker
(cherry picked from commit 983e71fa37e12fbae29eddc2b855ddaf6280cc0e)
Change-Id: I279275e11fb2ee6a223c7905652165d1b7a2e0ac
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 00e8e50a..e8ec4e8 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -21,11 +21,13 @@
#include
#include
+#include
#include
#include
#include
#include
#include
+#include
#include
#include
@@ -141,6 +143,8 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
if (!aDics.empty())
{
+uno::Reference< lang::XMultiServiceFactory >
xServiceFactory(comphelper::getProcessServiceFactory());
+uno::Reference< ucb::XSimpleFileAccess >
xAccess(xServiceFactory->createInstance("com.sun.star.ucb.SimpleFileAccess"),
uno::UNO_QUERY);
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
std::set< OUString, lt_rtl_OUString > aLocaleNamesSet;
@@ -148,10 +152,14 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
uno::Sequence< OUString > aLocaleNames( aDictIt->aLocaleNames
);
+uno::Sequence< OUString > aLocations( aDictIt->aLocations );
sal_Int32 nLen2 = aLocaleNames.getLength();
for (k = 0; k < nLen2; ++k)
{
-aLocaleNamesSet.insert( aLocaleNames[k] );
+if (xAccess.is() && xAccess->exists(aLocations[k]))
+{
+aLocaleNamesSet.insert( aLocaleNames[k] );
+}
}
}
// ... and add them to the resulting sequence
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/source
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
New commits:
commit 983e71fa37e12fbae29eddc2b855ddaf6280cc0e
Author: Kay Schenk <ksch...@apache.org>
Date: Thu Jan 28 22:19:30 2016 +
#i126762# patch by: hanya
Ignore dictionary not in specified location.
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 7449b6a..04a4f28 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -160,6 +161,18 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
numdict = aDics.size();
if (numdict)
{
+uno::Reference< lang::XMultiServiceFactory > xServiceFactory(
utl::getProcessServiceFactory() );
+uno::Reference< ucb::XSimpleFileAccess > xAccess;
+try
+{
+xAccess.set( xServiceFactory->createInstance(
+A2OU( "com.sun.star.ucb.SimpleFileAccess" ) ),
uno::UNO_QUERY_THROW );
+}
+catch (uno::Exception & e)
+{
+DBG_ASSERT( 0, "failed to get input stream" );
+(void) e;
+}
// get supported locales from the dictionaries-to-use...
sal_Int32 k = 0;
std::set< rtl::OUString, lt_rtl_OUString > aLocaleNamesSet;
@@ -167,10 +180,14 @@ Sequence< Locale > SAL_CALL SpellChecker::getLocales()
for (aDictIt = aDics.begin(); aDictIt != aDics.end(); ++aDictIt)
{
uno::Sequence< rtl::OUString > aLocaleNames(
aDictIt->aLocaleNames );
+uno::Sequence< rtl::OUString > aLocations( aDictIt->aLocations
);
sal_Int32 nLen2 = aLocaleNames.getLength();
for (k = 0; k < nLen2; ++k)
{
-aLocaleNamesSet.insert( aLocaleNames[k] );
+if (xAccess.is() && xAccess->exists(aLocations[k]))
+{
+aLocaleNamesSet.insert( aLocaleNames[k] );
+}
}
}
// ... and add them to the resulting sequence
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: formula/source
formula/source/ui/dlg/funcpage.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 55b0da55dbd4e811bd8c1c1f9b2fab33ad540c32 Author: Kay Schenk <ksch...@apache.org> Date: Tue Sep 29 01:23:47 2015 + i#126557# increase number of lines of dropdown of category listbox (cherry picked from commit 48cb20bb5c32f076f295c7490d6ba9ac96e85ed0) Change-Id: I18ba8a781e111fd7706de1eadb41c93a78e27c62 diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 7a25404..60a7f30 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -82,6 +82,7 @@ FuncPage::FuncPage(vcl::Window* pParent,const IFunctionManager* _pFunctionManage m_pLbCategory->SetEntryData(m_pLbCategory->InsertEntry(pCategory->getName()),const_cast(pCategory)); } +m_pLbCategory->SetDropDownLineCount(m_pLbCategory->GetEntryCount()); m_pLbCategory->SelectEntryPos(1); UpdateFunctionList(); m_pLbCategory->SetSelectHdl( LINK( this, FuncPage, SelHdl ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - formula/source
formula/source/ui/dlg/funcpage.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 48cb20bb5c32f076f295c7490d6ba9ac96e85ed0 Author: Kay Schenk <ksch...@apache.org> Date: Tue Sep 29 01:23:47 2015 + #i126557# Patch by: hanya diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 63d3563..ed82083 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -110,6 +110,7 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): aLbCategory.SetEntryData(aLbCategory.InsertEntry(pCategory->getName()),(void*)pCategory); } +aLbCategory.SetDropDownLineCount( aLbCategory.GetEntryCount() ); aLbCategory.SelectEntryPos(1); UpdateFunctionList(); aLbCategory.SetSelectHdl( LINK( this, FuncPage, SelHdl ) ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/source
sw/source/core/text/itrcrsr.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit aec10dffbd66cc6b4a8fc7ca6bb75cf589c81509
Author: Kay Schenk ksch...@apache.org
Date: Mon Aug 24 21:04:11 2015 +
#i126476# Patch by: Mark Hung
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 5c5e6eb..dc3d371 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -56,6 +56,7 @@
// -- OD 2010-05-05 #i111284#
#include numrule.hxx
// --
+#include com/sun/star/i18n/ScriptType.hpp
// Nicht reentrant !!!
// wird in GetCharRect gesetzt und im UnitUp/Down ausgewertet.
@@ -267,6 +268,9 @@ void SwTxtMargin::CtorInitTxtMargin( SwTxtFrm *pNewFrm,
SwTxtSizeInfo *pNewInf )
rSpace.IsAutoFirst() )
{
nFirstLineOfs = GetFnt()-GetSize( GetFnt()-GetActual()
).Height();
+LanguageType aLang = pNode-GetLang( 0, 1,
i18n::ScriptType::ASIAN);
+if (aLang != LANGUAGE_KOREAN aLang !=
LANGUAGE_JAPANESE)
+nFirstLineOfs=1;
const SvxLineSpacingItem *pSpace = aLineInf.GetLineSpacing();
if( pSpace )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - ooxml/source
ooxml/source/framework/JavaPartManager/.classpath | 21 ooxml/source/framework/JavaPartManager/.project | 21 ooxml/source/framework/OOXMLViewer/.classpath | 37 +++--- ooxml/source/framework/OOXMLViewer/.project | 55 +++--- 4 files changed, 109 insertions(+), 25 deletions(-) New commits: commit a36df662fb300c0209fed5f97d851dcb457e91c6 Author: Kay Schenk ksch...@apache.org Date: Mon Jul 13 20:55:14 2015 + #i126401# Add ASF license headers Patch by: Gavin McDonald diff --git a/ooxml/source/framework/OOXMLViewer/.project b/ooxml/source/framework/OOXMLViewer/.project old mode 100755 new mode 100644 index 51a9631..af7979c --- a/ooxml/source/framework/OOXMLViewer/.project +++ b/ooxml/source/framework/OOXMLViewer/.project @@ -1,17 +1,38 @@ -?xml version=1.0 encoding=UTF-8? -projectDescription - nameOOXMLViewer/name - comment/comment - projects - /projects - buildSpec - buildCommand - nameorg.eclipse.jdt.core.javabuilder/name - arguments - /arguments - /buildCommand - /buildSpec - natures - natureorg.eclipse.jdt.core.javanature/nature - /natures -/projectDescription +?xml version=1.0 encoding=UTF-8? +!--*** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +***-- + +projectDescription + nameOOXMLViewer/name + comment/comment + projects + /projects + buildSpec + buildCommand + nameorg.eclipse.jdt.core.javabuilder/name + arguments + /arguments + /buildCommand + /buildSpec + natures + natureorg.eclipse.jdt.core.javanature/nature + /natures +/projectDescription commit bed851e498f8a532fa9785e420ba26472cef6216 Author: Kay Schenk ksch...@apache.org Date: Mon Jul 13 20:54:59 2015 + #i126401# Add ASF license headers Patch by: Gavin McDonald diff --git a/ooxml/source/framework/OOXMLViewer/.classpath b/ooxml/source/framework/OOXMLViewer/.classpath old mode 100755 new mode 100644 index ecd0bc8..4f9fc83 --- a/ooxml/source/framework/OOXMLViewer/.classpath +++ b/ooxml/source/framework/OOXMLViewer/.classpath @@ -1,8 +1,29 @@ -?xml version=1.0 encoding=UTF-8? -classpath - classpathentry kind=src path=src/ - classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/ - classpathentry combineaccessrules=false kind=src path=/JavaPartManager/ - classpathentry combineaccessrules=false kind=src path=/JavaOOXMLParser/ - classpathentry kind=output path=bin/ -/classpath +?xml version=1.0 encoding=UTF-8? +!--*** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +***-- + +classpath + classpathentry kind=src path=src/ + classpathentry kind=con path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7/ + classpathentry combineaccessrules=false kind=src path=/JavaPartManager/ + classpathentry
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - filter/source
filter/source/config/fragments/fcfg_writer.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit d4dcdfa54b940afb09d6086a179a02c6ff1daa40 Author: Kay Schenk ksch...@apache.org Date: Wed Jun 3 22:53:11 2015 + #i126281# Remove HWP as an option to Writer open menu. diff --git a/filter/source/config/fragments/fcfg_writer.mk b/filter/source/config/fragments/fcfg_writer.mk index 115d711..68bfba2 100644 --- a/filter/source/config/fragments/fcfg_writer.mk +++ b/filter/source/config/fragments/fcfg_writer.mk @@ -40,7 +40,6 @@ T4_WRITER = \ writer_T602_Document \ writer_Text \ writer_Text_encoded \ -writer_MIZI_Hwp_97 \ writer_StarOffice_XML_Writer_Template \ pdf_Portable_Document_Format\ writer8_template\ @@ -74,7 +73,6 @@ F4_WRITER = \ T602Document \ Text \ Text__encoded_ \ -writer_MIZI_Hwp_97 \ writer_StarOffice_XML_Writer_Template \ writer_pdf_Export\ writer8\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - rat-excludes
rat-excludes |4 1 file changed, 4 deletions(-) New commits: commit 5b0df64160678bbbd373bd80de8583d25c77df49 Author: Kay Schenk ksch...@apache.org Date: Thu May 7 22:13:12 2015 + Remove hangul info from rat-excludes. diff --git a/rat-excludes b/rat-excludes index 0f08f157..eb808d1 100644 --- a/rat-excludes +++ b/rat-excludes @@ -138,10 +138,6 @@ main/extras/source/misc_config/autotbl.fmt # binary information for a Visual Basic form (?) main/migrationanalysis/src/wizard/Wizard.FRX -# Used in main/testautomation/writer/optional/input/import/hangul.hwp (1), part of SGA -# binary? AOO specific? Hangul Word Processor file -main/testautomation/writer/optional/input/import/hangul.hwp - # main/scripting/java/org/openoffice/netbeans/editor/OOo.jcb (1), part of SGA # binary, file type not clear main/scripting/java/org/openoffice/netbeans/editor/OOo.jcb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/Module_vcl.mk
vcl/Module_vcl.mk |8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) New commits: commit 1b4025b58e01bcc3151d2b32ed4a3a99c7329245 Author: Kay Schenk ksch...@apache.org Date: Thu Mar 19 21:37:55 2015 + #126118# Fix malformed if statements in makefile. diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 3779f68..6272197 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -38,17 +38,19 @@ $(eval $(call gb_Module_add_targets,vcl,\ Library_desktop_detector \ )) -ifneq ($(ENABLE_GTK),) + +ifeq ($(ENABLE_GTK),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_gtk \ )) endif -ifneq ($(ENABLE_KDE),) + +ifeq ($(ENABLE_KDE),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_kde \ )) endif -ifneq ($(ENABLE_KDE4),) +ifeq ($(ENABLE_KDE4),TRUE) $(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_kde4 \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/data/org/openoffice/Inet.xcu | 132 1 file changed, 132 deletions(-) New commits: commit 691fc7cabbd42d144d1e42db5f6ef7090a46f3f4 Author: Kay Schenk ksch...@apache.org Date: Mon Mar 2 23:01:53 2015 + #i125498# Patch by: Logan Removed non-functioning search engines. diff --git a/officecfg/registry/data/org/openoffice/Inet.xcu b/officecfg/registry/data/org/openoffice/Inet.xcu index f779044..0967694 100644 --- a/officecfg/registry/data/org/openoffice/Inet.xcu +++ b/officecfg/registry/data/org/openoffice/Inet.xcu @@ -91,50 +91,6 @@ /prop /node node oor:name=SearchEngines -node oor:name=Lycos oor:op=replace - node oor:name=And -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://search.lycos.com/default.asp?loc=searchboxamp;query=amp;adv=1amp;tab=webamp;wfr=%2Bamp;wfw=amp;wfq=/value -/prop -prop oor:name=ooInetSuffix oor:type=xs:string - valueamp;wfr=amp;wfw=amp;wfq=amp;wfr=-amp;wfw=amp;wfq=amp;wfc=3amp;df0=iamp;dfq=amp;df1=eamp;dfq=amp;dfc=2amp;lang=amp;adf=-2amp;ca=amp;submit_button=Submit+Search/value -/prop -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value+/value -/prop - /node - node oor:name=Exact -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://search.lycos.com/default.asp?lpv=1amp;loc=searchhpamp;tab=webamp;query=%22/value -/prop -prop oor:name=ooInetSuffix oor:type=xs:string - value%22/value -/prop -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value%20/value -/prop - /node - node oor:name=Or -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://search.lycos.com/default.asp?loc=searchboxamp;query=amp;adv=1amp;tab=webamp;wfr=amp;wfw=amp;wfq=/value -/prop -prop oor:name=ooInetSuffix oor:type=xs:string - valueamp;wfr=amp;wfw=amp;wfq=amp;wfr=-amp;wfw=amp;wfq=amp;wfc=3amp;df0=iamp;dfq=amp;df1=eamp;dfq=amp;dfc=2amp;lang=amp;adf=-2amp;ca=amp;submit_button=Submit+Search/value -/prop -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value+/value -/prop - /node -/node node oor:name=Google oor:op=replace node oor:name=And prop oor:name=ooInetSuffix oor:type=xs:string @@ -179,94 +135,6 @@ /prop /node /node -node oor:name=Hotbot oor:op=replace - node oor:name=Or -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://www.hotbot.com/default.asp?prov=HotBotamp;query=/value -/prop -prop oor:name=ooInetSuffix oor:type=xs:string - valueamp;ps=amp;loc=searchboxamp;tab=web/value -/prop -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value+/value -/prop - /node - node oor:name=And -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://www.hotbot.com/adv.asp?prov=HotBotamp;query=/value -/prop -prop oor:name=ooInetSuffix oor:type=xs:string - valueamp;ps=amp;loc=searchboxamp;tab=webamp;lang=amp;dfi=amp;dfe=amp;region=amp;wfc=2amp;wfr=%2Bamp;wfw=amp;wfq=amp;wfr=amp;wfw=amp;wfq=amp;date=0amp;past=amp;dateop=after/value -/prop -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value+/value -/prop - /node - node oor:name=Exact -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://www.hotbot.com/default.asp?prov=HotBotamp;query=%22/value -/prop -prop oor:name=ooInetSuffix oor:type=xs:string - value%22amp;ps=amp;loc=searchboxamp;tab=webamp;wfc=2amp;wfr=%22amp;wfr=amp;wfw=amp;wfw=amp;wfq=amp;wfq=/value -/prop -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value%20/value -/prop - /node -/node -node oor:name=Excite oor:op=replace - node oor:name=And -prop oor:name=ooInetCaseMatch oor:type=xs:int - value0/value -/prop -prop oor:name=ooInetPrefix oor:type=xs:string - valuehttp://msxml.excite.com/_1_2Z31TR6046OF684__info.xcite/dog/results?otmpl=dog/webresults.htmamp;qcat=webamp;ran=30967amp;qkw=/value -/prop -prop oor:name=ooInetSeparator oor:type=xs:string - value+/value -/prop
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d87ecd2566368b8ccdf43db09425093fff343922 Author: Kay Schenk ksch...@apache.org Date: Tue Feb 10 21:44:38 2015 + Related: #i125985# Change Insert Footnote toolbar comment Suggested by Keith McKenna, Comment 28. (cherry picked from commit 45c93e33d0c8ec527dd7c3af66fb9f9dea527871) Conflicts: officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu Change-Id: Ib5706cae8f7ca282803f0e133c4786fbbb39262a diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 979bc8d..e633afa 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -570,7 +570,7 @@ /node node oor:name=.uno:InsertFootnote oor:op=replace prop oor:name=Label oor:type=xs:string - value xml:lang=en-USInsert Footnote/value + value xml:lang=en-USInsert Footnote/Endnote/value /prop prop oor:name=Properties oor:type=xs:int value1/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 45c93e33d0c8ec527dd7c3af66fb9f9dea527871 Author: Kay Schenk ksch...@apache.org Date: Tue Feb 10 21:44:38 2015 + #i125985# Suggested by Keith McKenna, Comment 28. Insert toolbar comments changed in accordence with Keith's recommendation. diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 4cbd140..176fbc8 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -788,7 +788,7 @@ /node node oor:name=.uno:InsertFootnote oor:op=replace prop oor:name=Label oor:type=xs:string -value xml:lang=en-USInsert Footnote/Endnote Directly/value +value xml:lang=en-USInsert Footnote Directly/value /prop prop oor:name=Properties oor:type=xs:int value1/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - external_deps.lst more_fonts/fonts more_fonts/prj
external_deps.lst | 12 +++- more_fonts/fonts/ttf_dejavu/makefile.mk |6 +++--- more_fonts/prj/d.lst|4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) New commits: commit ee8796b44908bc35ca1dd0e367b2f15cc9d80e91 Author: Kay Schenk ksch...@apache.org Date: Wed Jan 7 23:42:09 2015 + #i125922# Patch by: Michal HriÅ Dejavu font update. diff --git a/more_fonts/fonts/ttf_dejavu/makefile.mk b/more_fonts/fonts/ttf_dejavu/makefile.mk index b23462b..1b8f596 100644 --- a/more_fonts/fonts/ttf_dejavu/makefile.mk +++ b/more_fonts/fonts/ttf_dejavu/makefile.mk @@ -39,9 +39,9 @@ TARGET=ttf_dejavu # --- Files -TARFILE_NAME=dejavu-fonts-ttf-2.33 -TARFILE_MD5=f872f4ac066433d8ff92f5e316b36ff9 -TARFILE_ROOTDIR=dejavu-fonts-ttf-2.33 +TARFILE_NAME=dejavu-fonts-ttf-2.34 +TARFILE_MD5=161462de16e2ca79873bc2b0d2e6c74c +TARFILE_ROOTDIR=dejavu-fonts-ttf-2.34 PATCH_FILES= commit a7eba49f6f3ae816a03086298a5869c871362660 Author: Kay Schenk ksch...@apache.org Date: Wed Jan 7 23:39:25 2015 + #i125922# Patch by: Michal HriÅ dejavu font update. diff --git a/more_fonts/prj/d.lst b/more_fonts/prj/d.lst index 1bb19c9..8145961 100644 --- a/more_fonts/prj/d.lst +++ b/more_fonts/prj/d.lst @@ -1,8 +1,8 @@ mkdir: %COMMON_DEST%\pck%_EXT% ..\fonts\fc_local.conf %COMMON_DEST%\pck%_EXT%\fc_local.conf # TODO: replace explicit versions by wildcard when the build system learns to handle them -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf -..\%__SRC%\misc\build\dejavu-fonts-ttf-2.33\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\ttf\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf +..\%__SRC%\misc\build\dejavu-fonts-ttf-2.34\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_dejavu ..\%__SRC%\misc\build\croscorefonts-1.21.0\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf ..\%__SRC%\misc\build\croscorefonts-1.21.0\LICENSE %COMMON_DEST%\pck%_EXT%\LICENSE_croscorefonts ..\%__SRC%\misc\build\gentiumbasic-fonts-1.10\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf commit 6f31a5f6f752a9724acd270b0eb806bcb21c2db1 Author: Kay Schenk ksch...@apache.org Date: Wed Jan 7 22:48:39 2015 + #i125922# Patch by: Michal HriÅ Update dejauvu fonts to 2.34 diff --git a/external_deps.lst b/external_deps.lst index 1f6b6c4..c32029c 100644 --- a/external_deps.lst +++ b/external_deps.lst @@ -25,7 +25,9 @@ # fallback server is used. # The primary fallback site. -OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/ +# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/ + +OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/ # Must not fallback to svn # SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/ @@ -232,10 +234,10 @@ if (SYSTEM_CURL != YES) URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if (WITH_CATA_FONTS == YES) -MD5 = f872f4ac066433d8ff92f5e316b36ff9 -name = dejavu-fonts-ttf-2.33.zip -URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.33/dejavu-fonts-ttf-2.33.zip/download -URL2 = $(OOO_EXTRAS)$(MD5)-$(name) +MD5 = 161462de16e2ca79873bc2b0d2e6c74c +name = dejavu-fonts-ttf-2.34.tar.bz2 +URL1 = http://sourceforge.net/projects/dejavu/files/dejavu/2.34/dejavu-fonts-ttf-2.34.tar.bz2/download +# URL2 = $(OOO_EXTRAS)$(MD5)-$(name) if ( true ) MD5 = fdb27bfe2dbe2e7b57ae194d9bf36bab ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit faf99f6f405e076d5c9ab95c876ae1ffb896f8d1 Author: Kay Schenk ksch...@apache.org Date: Fri Sep 26 09:31:26 2014 +0100 Updated core Project: help c4b49fbddd2099733cb5c7606fbc5b848b23c1e0 diff --git a/helpcontent2 b/helpcontent2 index c15adbc..c4b49fb 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c15adbcd9f39fdd4f2a2e53749e5dc47b365d406 +Subproject commit c4b49fbddd2099733cb5c7606fbc5b848b23c1e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/shared/explorer/database/02010100.xhp | 98 +-
1 file changed, 62 insertions(+), 36 deletions(-)
New commits:
commit c4b49fbddd2099733cb5c7606fbc5b848b23c1e0
Author: Kay Schenk ksch...@apache.org
Date: Fri Sep 26 09:31:26 2014 +0100
Added information on date types to correspond to SQL2.
Reformatted information a bit
Change-Id: I0e9be1d68b78aa60f1eb3a30be708ff966ebaea1
diff --git a/source/text/shared/explorer/database/02010100.xhp
b/source/text/shared/explorer/database/02010100.xhp
index a317ab7..83a2849 100644
--- a/source/text/shared/explorer/database/02010100.xhp
+++ b/source/text/shared/explorer/database/02010100.xhp
@@ -319,6 +319,7 @@
paragraph role=heading id=hd_id3148926 xml-lang=en-US level=3
l10n=U oldref=37Formulating filter conditions/paragraph
section id=abfragekriterien
paragraph role=paragraph id=par_id3153162 xml-lang=en-US l10n=U
oldref=38When formulating filter conditions, various operators and commands
are available to you. Apart from the relational operators, there are
SQL-specific commands that query the content of database fields. If you use
these commands in the $[officename] syntax, $[officename] automatically
converts these into the corresponding SQL syntax. You can also enter the SQL
command directly. The following tables give an overview of the operators and
commands:/paragraph
+
table id=tbl_id3152803
tablerow
tablecell colspan= rowspan=
@@ -399,6 +400,7 @@
/tablecell
/tablerow
/table
+
table id=tbl_id3153376
tablerow
tablecell colspan= rowspan=
@@ -573,6 +575,15 @@
paragraph role=paragraph id=par_id3150948 xml-lang=en-US l10n=U
oldref=119returns field names with the field content Ms./paragraph
/tablecell
/tablerow
+
+tablerow
+tablecell colspan= rowspan=
+paragraph role=paragraph id=par_id315379A xml-lang=en-US l10n=U
oldref=118lt;'2001-01-10'/paragraph
+/tablecell
+tablecell colspan= rowspan=
+paragraph role=paragraph id=par_id315094A xml-lang=en-US l10n=U
oldref=119returns dates that occurred before January 10, 2001/paragraph
+/tablecell
+/tablerow
tablerow
tablecell colspan= rowspan=
paragraph role=paragraph id=par_id3150333 xml-lang=en-US l10n=U
oldref=120LIKE 'g?ve'/paragraph
@@ -615,73 +626,88 @@
/tablerow
/table
/section
+
+paragraph role=paragraph id=par_id3146073 xml-lang=en-US l10n=U
oldref=268
+emphLike /emphEscape Sequence: {escape 'escape-character'}/paragraph
+paragraph role=paragraph id=par_id3150661 xml-lang=en-US l10n=U
oldref=269Example: select * from Item where ItemName like 'The *%' {escape
'*'}/paragraph
+paragraph role=paragraph id=par_id3148541 xml-lang=en-US l10n=U
oldref=270The example will give you all of the entries where the item name
begins with 'The *'. This means that you can also search for characters that
would otherwise be interpreted as placeholders, such as *, ?, _, % or the
period./paragraph
+paragraph role=paragraph id=par_id3150572 xml-lang=en-US l10n=U
oldref=271
+emphOuter Join/emph Escape Sequence: {oj outer-join}/paragraph
+paragraph role=paragraph id=par_id3156052 xml-lang=en-US l10n=U
oldref=272Example: select Article.* from {oj item LEFT OUTER JOIN orders ON
item.no=orders.ANR}/paragraph
+paragraph role=heading id=hd_id3153674 xml-lang=en-US level=3
l10n=U oldref=109Querying text fields/paragraph
+paragraph role=paragraph id=par_id3149134 xml-lang=en-US l10n=U
oldref=110To query the content of a text field, you must put the expression
between single quotes. The distinction between uppercase and lowercase letters
depends on the database in use. LIKE, by definition, is case-sensitive (though
some databases don't see it that strict)./paragraph
+
+paragraph role=heading id=hd_id3149302 xml-lang=en-US level=3
l10n=U oldref=111Querying date fields/paragraph
+!--//kls begin edits --
paragraph role=paragraph id=par_id3157998 xml-lang=en-US l10n=U
oldref=252
-emphDate fields/emph are represented as #Date# to clearly identify them as
dates. The date condition will be reproduced in the resulting SQL statement in
the following ODBC - compliant way:/paragraph
+emphDate fields/emph are represented as #Date# to clearly identify them as
dates. Date, time and date/time constants (literals) used in conditions can be
of either the SQL Escape Syntax type, or default SQL2 syntax./paragraph
+
table id=tbl_id3156186
tablerow
tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3153734 xml-lang=en-US l10n=U
oldref=253Date/paragraph
-/tablecell
+paragraph role=tablehead id=par_id31537341 xml-lang=en-US l10n=U
oldref=253Date Type Element/paragraph
+/tablecell
tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3159131 xml-lang=en-US l10n=U
oldref=254{D'-MM-DD'}/paragraph
+paragraph role=tablehead id=par_id31537342 xml-lang=en-US l10n=U
oldref=253SQL Escape syntax #1 - may be obsolete/paragraph
/tablecell
-/tablerow
-tablerow
tablecell colspan= rowspan=
-paragraph role=paragraph id=par_id3153937 xml
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - dbaccess/source
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 48 +++--
1 file changed, 43 insertions(+), 5 deletions(-)
New commits:
commit 79ff7fc76c74a012933230d6f3c37977eccc6398
Author: Kay Schenk ksch...@apache.org
Date: Thu Sep 18 22:49:12 2014 +
#i121492
Patch by: hanya
Fixed date filter problems in table view. Now processes old style date
format and normal for database as expected.
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 1c3849f..30170f8 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -1507,7 +1507,44 @@ Reference XIndexAccess SAL_CALL
OSingleSelectQueryComposer::getOrderColumns(
//
-
namespace
{
-::rtl::OUString lcl_getCondition(const Sequence Sequence PropertyValue
filter,const OPredicateInputController i_aPredicateInputController,const
Reference XNameAccess i_xSelectColumns)
+::rtl::OUString lcl_getDecomposedColumnName( const ::rtl::OUString
rComposedName, const ::rtl::OUString rQuoteString )
+{
+const sal_Int32 nQuoteLength = rQuoteString.getLength();
+::rtl::OUString sName = rComposedName.trim();
+::rtl::OUString sColumnName;
+sal_Int32 nPos, nRPos = 0;
+
+for (;;)
+{
+nPos = sName.indexOf( rQuoteString, nRPos );
+if ( nPos = 0 )
+{
+nRPos = sName.indexOf( rQuoteString, nPos + nQuoteLength );
+if ( nRPos nPos )
+{
+if ( nRPos + nQuoteLength sName.getLength() )
+{
+nRPos += nQuoteLength; // -1 + 1 skip dot
+}
+else
+{
+sColumnName = sName.copy( nPos + nQuoteLength, nRPos -
nPos - nQuoteLength );
+break;
+}
+}
+else
+break;
+}
+else
+break;
+}
+return sColumnName.isEmpty() ? rComposedName : sColumnName;
+}
+
+::rtl::OUString lcl_getCondition(const Sequence Sequence PropertyValue
filter,
+const OPredicateInputController i_aPredicateInputController,
+const Reference XNameAccess i_xSelectColumns,
+const ::rtl::OUString rQuoteString )
{
::rtl::OUStringBuffer sRet;
const Sequence PropertyValue * pOrIter = filter.getConstArray();
@@ -1524,9 +1561,10 @@ namespace
sRet.append(pAndIter-Name);
::rtl::OUString sValue;
pAndIter-Value = sValue;
-if ( i_xSelectColumns.is()
i_xSelectColumns-hasByName(pAndIter-Name) )
+const ::rtl::OUString sColumnName =
lcl_getDecomposedColumnName( pAndIter-Name, rQuoteString );
+if ( i_xSelectColumns.is()
i_xSelectColumns-hasByName(sColumnName) )
{
-ReferenceXPropertySet
xColumn(i_xSelectColumns-getByName(pAndIter-Name),UNO_QUERY);
+ReferenceXPropertySet
xColumn(i_xSelectColumns-getByName(sColumnName),UNO_QUERY);
sValue =
i_aPredicateInputController.getPredicateValue(sValue,xColumn,sal_True);
}
else
@@ -1552,14 +1590,14 @@ void SAL_CALL
OSingleSelectQueryComposer::setStructuredFilter( const Sequence S
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OSingleSelectQueryComposer::setStructuredFilter );
OPredicateInputController
aPredicateInput(m_aContext.getLegacyServiceFactory(),m_xConnection);
-setFilter(lcl_getCondition(filter,aPredicateInput,getColumns()));
+setFilter(lcl_getCondition(filter,aPredicateInput,getColumns(),
m_xMetaData-getIdentifierQuoteString()));
}
//
-
void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const
Sequence Sequence PropertyValue filter ) throw (SQLException,
RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, dbaccess, ocke.jans...@sun.com,
OSingleSelectQueryComposer::setStructuredHavingClause );
OPredicateInputController
aPredicateInput(m_aContext.getLegacyServiceFactory(),m_xConnection);
-setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns()));
+setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns(),
m_xMetaData-getIdentifierQuoteString()));
}
//
-
void OSingleSelectQueryComposer::setConditionByColumn( const Reference
XPropertySet column, sal_Bool andCriteria
,::std::mem_fun1_tbool
