[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source
dbaccess/qa/extras/macros-test.cxx |6 -
dbaccess/source/core/recovery/subcomponentrecovery.cxx |5
dbaccess/source/ext/macromigration/migrationengine.cxx | 19 ++---
dbaccess/source/ext/macromigration/migrationlog.cxx| 14 +++-
dbaccess/source/sdbtools/connection/objectnames.cxx|6 -
dbaccess/source/ui/misc/WCopyTable.cxx |3 --
6 files changed, 11 insertions(+), 42 deletions(-)
New commits:
commit 9a1aca007fd06f3f8223ee02a79e44099d778b51
Author: Jelle van der Waa je...@vdwaa.nl
Date: Sat Aug 17 22:14:22 2013 +0200
fdo#57950: Remove some chained appends in dbaccess
Change-Id: If93b4a11ac15ede2b08ef42bb2fa4670f0d4cd24
Reviewed-on: https://gerrit.libreoffice.org/5481
Reviewed-by: Andrzej J.R. Hunt andr...@ahunt.org
Tested-by: Andrzej J.R. Hunt andr...@ahunt.org
diff --git a/dbaccess/qa/extras/macros-test.cxx
b/dbaccess/qa/extras/macros-test.cxx
index cc0a437..bcff534 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -51,11 +51,7 @@ private:
void DBAccessTest::createFileURL(const OUString aFileBase, const OUString
aFileExtension, OUString rFilePath)
{
-OUString aSep(/);
-OUStringBuffer aBuffer( getSrcRootURL() );
-aBuffer.append(m_aBaseString);
-aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
-rFilePath = aBuffer.makeStringAndClear();
+rFilePath = getSrcRootURL() + m_aBaseString + / + aFileBase +
aFileExtension;
}
DBAccessTest::DBAccessTest()
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index af11780..0981787 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -218,10 +218,7 @@ namespace dbaccess
private:
OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken )
{
-OUStringBuffer aQualifiedName( m_aNamespace );
-aQualifiedName.append( sal_Unicode( ':' ) );
-aQualifiedName.append( ::xmloff::token::GetXMLToken( i_eToken ) );
-return aQualifiedName.makeStringAndClear();
+return m_aNamespace + : + ::xmloff::token::GetXMLToken( i_eToken
);
}
private:
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c0ec435..8d0b5f1 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1253,12 +1253,7 @@ namespace dbmm
}
sBaseName = aReplacement.makeStringAndClear();
-OUStringBuffer aNewLibNameAttempt;
-aNewLibNameAttempt.append( sPrefix );
-aNewLibNameAttempt.append( sBaseName );
-aNewLibNameAttempt.appendAscii( _ );
-aNewLibNameAttempt.append( _rSourceLibName );
-OUString sTargetName( aNewLibNameAttempt.makeStringAndClear()
);
+OUString sTargetName( sPrefix + sBaseName + _ +
_rSourceLibName );
if ( !_rxTargetContainer-hasByName( sTargetName ) )
return sTargetName;
}
@@ -1267,12 +1262,7 @@ namespace dbmm
// (The latter is valid, since there can be multiple sub documents
with the same base name,
// in different levels in the hierarchy.)
// In this case, just use the umambiguous sub document number.
-OUStringBuffer aNewLibName;
-aNewLibName.append( sPrefix );
-aNewLibName.append( OUString::valueOf( sal_Int64(
_rDocument.nNumber ) ) );
-aNewLibName.appendAscii( _ );
-aNewLibName.append( _rSourceLibName );
-return aNewLibName.makeStringAndClear();
+return sPrefix + OUString::valueOf( sal_Int64( _rDocument.nNumber
) ) + _ + _rSourceLibName;
}
}
@@ -1680,10 +1670,7 @@ namespace dbmm
OSL_ENSURE( sLibrary != sNewLibName,
MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: a
library which has not been migrated? );
-OUStringBuffer aNewLocation;
-aNewLocation.append( sNewLibName );
-aNewLocation.append( sScriptName.copy( nLibModuleSeparator ) );
-xUri-setName( aNewLocation.makeStringAndClear() );
+xUri-setName( sNewLibName + sScriptName.copy( nLibModuleSeparator
) );
// update the new script URL
_inout_rScriptCode = xUri-getUriReference();
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx
b/dbaccess/source/ext/macromigration/migrationlog.cxx
index cee6065..f4c1ac9 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -430,11 +430,8 @@ namespace dbmm
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/basecontainer.cxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 9793d387529227f8e0a56e82ffa066ee294d5d50 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Aug 19 08:55:42 2013 +0200 Use standard idiom Change-Id: I77b2732e04435ee93044b65c4925de43cc20187f diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index ebbb7f2..f32bc8a 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -133,7 +133,7 @@ void BaseContainer::impl_initFlushMode() m_pFlushCache = m_rCache-clone(); if (!m_pFlushCache) throw css::uno::RuntimeException( Cant create write copy of internal used cache on demand., -dynamic_cast css::container::XNameAccess* (this)); +static_cast OWeakObject* (this)); // - SAFE } @@ -502,7 +502,7 @@ void SAL_CALL BaseContainer::flush() if (!m_pFlushCache) throw css::lang::WrappedTargetRuntimeException( Cant guarantee cache consistency. Special flush container does not exists!, -dynamic_cast css::container::XNameAccess* (this), +static_cast OWeakObject* (this), css::uno::Any()); try @@ -524,7 +524,7 @@ void SAL_CALL BaseContainer::flush() // later again ... throw css::lang::WrappedTargetRuntimeException( Flush rejected by internal container., -dynamic_cast css::container::XNameAccess* (this), +static_cast OWeakObject* (this), css::uno::makeAny(ex)); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: comphelper/source include/comphelper include/sfx2 sfx2/source unusedcode.easy
comphelper/source/misc/componentcontext.cxx |6 --
include/comphelper/componentcontext.hxx |8
include/sfx2/templdlg.hxx |1 -
sfx2/source/dialog/templdlg.cxx |8
unusedcode.easy |2 --
5 files changed, 25 deletions(-)
New commits:
commit a3b06ecf4217016c883ce40e52fcd4b6a2d25860
Author: Caolán McNamara caol...@redhat.com
Date: Mon Aug 19 08:25:05 2013 +0100
callcatcher: remove some more unused code
Change-Id: I7332b0ead075e09b60549203bc32eb99a2bb0430
diff --git a/comphelper/source/misc/componentcontext.cxx
b/comphelper/source/misc/componentcontext.cxx
index dded964..ac9194c 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -108,12 +108,6 @@ namespace comphelper
return Reference XInterface ( getContextValueByName( sKey ),
UNO_QUERY );
}
-//
-Reference XMultiServiceFactory
ComponentContext::getLegacyServiceFactory() const
-{
-return Reference XMultiServiceFactory ( m_xORB, UNO_QUERY_THROW );
-}
-
//
} // namespace comphelper
//
diff --git a/include/comphelper/componentcontext.hxx
b/include/comphelper/componentcontext.hxx
index ce2f583..f99fb56 100644
--- a/include/comphelper/componentcontext.hxx
+++ b/include/comphelper/componentcontext.hxx
@@ -199,14 +199,6 @@ namespace comphelper
return getSingleton( OUString::createFromAscii(
_pAsciiInstanceName ) );
}
-/** returns the -XMultiServiceFactory interface of -m_xORB, for
passing to
-older code which does not yet support -XMultiComponentFactory
-@throws ::com::sun::star::uno::RuntimeException
-if our our component factory does not support this interface
-*/
-::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory
-getLegacyServiceFactory() const;
-
/** retrieves a value from our component context
@param _rName
the name of the value to retrieve
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 9c57455..9cee34d 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -94,7 +94,6 @@ public:
virtual voidStateChanged( StateChangedType nStateChange );
virtual voidFreeResource (void);
-ISfxTemplateCommon* GetISfxTemplateCommon();
voidSetParagraphFamily();
private:
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 1dee9ac..b86bb00 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -412,14 +412,6 @@ SfxTemplatePanelControl::~SfxTemplatePanelControl (void)
-ISfxTemplateCommon* SfxTemplatePanelControl::GetISfxTemplateCommon()
-{
-return pImpl-GetISfxTemplateCommon();
-}
-
-
-
-
void SfxTemplatePanelControl::SetParagraphFamily()
{
// first select the paragraph family
diff --git a/unusedcode.easy b/unusedcode.easy
index 2eebe0a..1469ac1 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -71,7 +71,6 @@ ServerFont::GetGlyphBitmap1(int, RawBitmap) const
ServerFont::GetGlyphBitmap8(int, RawBitmap) const
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxGrabBagItem::SetGrabBag(std::__debug::maprtl::OUString,
com::sun::star::uno::Any, std::lessrtl::OUString,
std::allocatorstd::pairrtl::OUString const, com::sun::star::uno::Any
const)
-SfxTemplatePanelControl::GetISfxTemplateCommon()
SfxTemplatePanelControl::SetParagraphFamily()
SmFontPickList::Contains(Font const) const
StatusBar::CopyItems(StatusBar const)
@@ -132,7 +131,6 @@
basegfx::unotools::homMatrixFromMatrix(basegfx::B2DHomMatrix, com::sun::star::g
canvas::createSurfaceProxyManager(boost::shared_ptrcanvas::IRenderModule
const)
comphelper::ComponentContext::ComponentContext(com::sun::star::uno::Referencecom::sun::star::lang::XMultiServiceFactory
const)
comphelper::ComponentContext::createComponentWithArguments(rtl::OUString
const, com::sun::star::uno::Sequencecom::sun::star::uno::Any const) const
-comphelper::ComponentContext::getLegacyServiceFactory() const
comphelper::ComponentContext::getSingleton(rtl::OUString const) const
comphelper::MediaDescriptor::PROP_DEEPDETECTION()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptrcomphelper::ConfigurationChanges
const, rtl::OUString const) const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua vcl/Library_vcl.mk
vcl/Library_vcl.mk |4
vcl/aqua/source/app/salinst.cxx |2 ++
2 files changed, 6 insertions(+)
New commits:
commit bd507a0d093b7d5239992440a40d0a7453b38207
Author: Tor Lillqvist t...@iki.fi
Date: Mon Aug 19 10:32:34 2013 +0300
fdo#39007: Brute force fix: Unlink a potential restorecount.plist file
It is not completely clear to me whether we really still might be
leaving such files around. After all, we now in *two* places (at least
in current master) tell our NSWindows to not be
restorable... Norbert's code in AquaSalFrame::initWindowAndView()
*and* Herbert Dürr's code in -[SalFrameWindow initWithSalFrame:].
On the other hand, Cocoa does seem to create the file and keep it
around for a short while before removing it (in responce to our
setRestorable:NO calls?), so there is a slight time window where if LO
crashes, the file will be left around.
Such a file might also be around from an older LO version, or manually
planted there by somebody wanting to reproduce the bug...
Of course, the *real* fix for this problem would be to make LO a
*proper* Cocoa document centric application, that would use
NSDocument, NSApplication etc like native applications are supposed
to, and that *would* handle window restoration the Cocoa way. I.e.,
work with the system instead of against it.
Change-Id: I9ed058130f49cf0221d899bef3e2654589c7
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 363f82a..ed9a0bd 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -352,6 +352,10 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
$(gb_OBJCXXFLAGS) \
))
+$(eval $(call gb_Library_add_defs,vcl,\
+ -DMACOSX_BUNDLE_IDENTIFIER=\$(MACOSX_BUNDLE_IDENTIFIER)\ \
+))
+
ifeq ($(ENABLE_CORETEXT),YES)
$(eval $(call gb_Library_add_defs,vcl,\
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 0f14d00..89ce263 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -184,6 +184,8 @@ static void initNSApp()
sal_Bool ImplSVMainHook( int * pnInit )
{
+unlink([[NSString stringWithFormat:@%@/Library/Saved Application
State/%s.savedState/restorecount.plist, NSHomeDirectory(),
MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
+
gpnInit = pnInit;
bNoSVMain = false;
___
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' - include/svx svx/source
include/svx/ctredlin.hxx |6 ++
svx/source/dialog/ctredlin.cxx | 20 +++-
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit c373d4a7807581459a474ffc0a277d0d6c00447a
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 18 14:16:10 2013 +0100
don't unconditionally enable buttons on switching to accept/reject page
we want to disable all of them when switch to the options page and *restore*
the original enable/disable state when switching back i.e. don't enable
them if
they were disabled due to change tracking password protection
regression since 8655095a4910ca795dfd182e6796d9375727a694
Change-Id: I2dd6c83fd9613adf42571684a08bff81b86c9ee1
(cherry picked from commit 30ba8fa46aafb0868ada3b0092cd33524c145989)
Reviewed-on: https://gerrit.libreoffice.org/5502
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c88b742..e8cb58b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -311,6 +311,12 @@ private:
PushButton* m_pRejectAll;
PushButton* m_pUndo;
+bool bEnableAccept;
+bool bEnableAcceptAll;
+bool bEnableReject;
+bool bEnableRejectAll;
+bool bEnableUndo;
+
DECL_LINK( PbClickHdl, PushButton* );
public:
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index b201d8d..fcd153d 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -476,6 +476,11 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry,
const OUString rStr,
SvxTPView::SvxTPView(Window * pParent)
: TabPage(pParent, RedlineViewPage, svx/ui/redlineviewpage.ui)
+, bEnableAccept(true)
+, bEnableAcceptAll(true)
+, bEnableReject(true)
+, bEnableRejectAll(true)
+, bEnableUndo(true)
{
Dialog *pTopLevel = GetParentDialog();
pTopLevel-get(m_pAccept, accept);
@@ -504,11 +509,11 @@ SvxTPView::SvxTPView(Window * pParent)
void SvxTPView::ActivatePage()
{
-m_pAccept-Enable();
-m_pReject-Enable();
-m_pAcceptAll-Enable();
-m_pRejectAll-Enable();
-m_pUndo-Enable();
+m_pAccept-Enable(bEnableAccept);
+m_pReject-Enable(bEnableReject);
+m_pAcceptAll-Enable(bEnableAcceptAll);
+m_pRejectAll-Enable(bEnableRejectAll);
+m_pUndo-Enable(bEnableUndo);
TabPage::ActivatePage();
}
@@ -559,21 +564,25 @@ void SvxTPView::InsertCalcHeader()
void SvxTPView::EnableAccept(sal_Bool nFlag)
{
+bEnableAccept = nFlag;
m_pAccept-Enable(nFlag);
}
void SvxTPView::EnableAcceptAll(sal_Bool nFlag)
{
+bEnableAcceptAll = nFlag;
m_pAcceptAll-Enable(nFlag);
}
void SvxTPView::EnableReject(sal_Bool nFlag)
{
+bEnableReject = nFlag;
m_pReject-Enable(nFlag);
}
void SvxTPView::EnableRejectAll(sal_Bool nFlag)
{
+bEnableRejectAll = nFlag;
m_pRejectAll-Enable(nFlag);
}
@@ -584,6 +593,7 @@ void SvxTPView::ShowUndo(sal_Bool nFlag)
void SvxTPView::EnableUndo(sal_Bool nFlag)
{
+bEnableUndo = nFlag;
m_pUndo-Enable(nFlag);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/connectivity
connectivity/source/commontools/dbtools2.cxx | 26 --
include/connectivity/dbtools.hxx | 16
2 files changed, 36 insertions(+), 6 deletions(-)
New commits:
commit acd9f66f2834c16650d37109650ed47e491a0241
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 15 10:02:26 2013 +0100
Split type-description out of createStandardColumnPart.
createStandardColumnPart returns a string that is usable in table creation,
the type descriptor (e.g. CHAR(N)) is also useful in column-type altering
statements, hence this is split into a separate function.
This is needed primarily in the firebird driver where column-type alter
statements are in a different form to most dbs.
Change-Id: If44554f979f6dd14bf679455978f3f0b44784bf5
Reviewed-on: https://gerrit.libreoffice.org/5432
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/connectivity/source/commontools/dbtools2.cxx
b/connectivity/source/commontools/dbtools2.cxx
index bf9fad6..055a3bd 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -60,7 +60,7 @@ namespace dbtools
using namespace connectivity;
using namespace comphelper;
-OUString createStandardColumnPart(const Reference XPropertySet
xColProp,const Reference XConnection _xConnection,ISQLStatementHelper*
_pHelper,const OUString _sCreatePattern)
+OUString createStandardTypePart(const Reference XPropertySet
xColProp,const Reference XConnection _xConnection,ISQLStatementHelper*
_pHelper,const OUString _sCreatePattern)
{
ReferenceXDatabaseMetaData xMetaData = _xConnection-getMetaData();
@@ -72,11 +72,6 @@ OUString createStandardColumnPart(const Reference
XPropertySet xColProp,cons
sal_Int32 nPrecision = 0;
sal_Int32 nScale = 0;
-const OUString sQuoteString = xMetaData-getIdentifierQuoteString();
-OUStringBuffer aSql =
::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME;
-
-aSql.appendAscii( );
-
nDataType = nPrecision = nScale = 0;
sal_Bool bIsAutoIncrement = sal_False;
xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPENAME))
= sTypeName;
@@ -85,6 +80,8 @@ OUString createStandardColumnPart(const Reference
XPropertySet xColProp,cons
xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCALE))
= nScale;
xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))
= bIsAutoIncrement;
+OUStringBuffer aSql;
+
// check if the user enter a specific string to create autoincrement values
OUString sAutoIncrementValue;
ReferenceXPropertySetInfo xPropInfo = xColProp-getPropertySetInfo();
@@ -180,6 +177,23 @@ OUString createStandardColumnPart(const Reference
XPropertySet xColProp,cons
return aSql.makeStringAndClear();
}
+
+OUString createStandardColumnPart(const Reference XPropertySet
xColProp,const Reference XConnection _xConnection,ISQLStatementHelper*
_pHelper,const OUString _sCreatePattern)
+{
+ReferenceXDatabaseMetaData xMetaData = _xConnection-getMetaData();
+
+::dbtools::OPropertyMap rPropMap = OMetaConnection::getPropMap();
+
+const OUString sQuoteString = xMetaData-getIdentifierQuoteString();
+OUStringBuffer aSql =
::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp-getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME;
+
+aSql.appendAscii( );
+
+aSql.append(createStandardTypePart(xColProp, _xConnection, _pHelper,
_sCreatePattern));
+
+return aSql.makeStringAndClear();
+}
+
//
-
OUString createStandardCreateStatement(const Reference XPropertySet
descriptor,const Reference XConnection _xConnection,ISQLStatementHelper*
_pHelper,const OUString _sCreatePattern)
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index 4242373..8064355 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -645,6 +645,22 @@ namespace dbtools
OUString createStandardKeyStatement( const
::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet
descriptor,
const
::com::sun::star::uno::Reference ::com::sun::star::sdbc::XConnection
_xConnection);
+/** creates the standard sql statement for the type part of a create or
alter table statement.
+@param _pHelper
+Allow to add special SQL constructs.
+@param descriptor
+The descriptor of the column.
+@param _xConnection
+The connection.
+@param _pHelper
+Allow to add special SQL constructs.
+*/
+
[Libreoffice-commits] core.git: configure.ac download.lst harfbuzz/ExternalPackage_harfbuzz.mk harfbuzz/ExternalProject_harfbuzz.mk harfbuzz/harfbuzz-0.9.16-winxp.patch.1 harfbuzz/harfbuzz.configure.p
Makefile.fetch |2 RepositoryExternal.mk |1 configure.ac |6 - download.lst |3 harfbuzz/ExternalPackage_harfbuzz.mk |5 - harfbuzz/ExternalProject_harfbuzz.mk |6 + harfbuzz/UnpackedTarball_harfbuzz.mk |5 - harfbuzz/harfbuzz-0.9.16-winxp.patch.1 | 137 - harfbuzz/harfbuzz.configure.patch.1| 108 -- 9 files changed, 14 insertions(+), 259 deletions(-) New commits: commit 3bd7d5520fc15ee0e0cf930e73041ce6a18cb619 Author: Khaled Hosny khaledho...@eglug.org Date: Sat Aug 17 14:47:55 2013 +0200 Update internal HarfBuzz to 0.9.19 Change-Id: I520832508a8d419e394817a0e25949071928f612 Reviewed-on: https://gerrit.libreoffice.org/5478 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/Makefile.fetch b/Makefile.fetch index 2ea9ac8..dbfcc5d 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -77,6 +77,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ $(call fetch_Optional,CDR,CDR_TARBALL) \ $(call fetch_Optional,FIREBIRD,FIREBIRD_TARBALL) \ + $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,MSPUB,MSPUB_TARBALL) \ $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ @@ -114,7 +115,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,GLIBC,$(GLIBC_TARBALL)) \ $(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \ $(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \ - $(call fetch_Optional,HARFBUZZ,$(HARFBUZZ_TARBALL)) \ $(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \ $(call fetch_Optional,ICU,$(ICU_TARBALL)) \ $(call fetch_Optional,ICU,$(ICU_51_LAYOUT_FIX_TARBALL)) \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1015b6c..5962dc4 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1246,6 +1246,7 @@ $(call gb_LinkTarget_use_package,$(1),\ ) $(call gb_LinkTarget_use_static_libraries,$(1),\ harfbuzz \ + harfbuzz-icu \ ) endef diff --git a/configure.ac b/configure.ac index b0514a0..eb08245 100644 --- a/configure.ac +++ b/configure.ac @@ -8910,11 +8910,7 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support]) if test $_os != WINNT -a $_os != Darwin; then AC_MSG_RESULT([yes]) ENABLE_HARFBUZZ=TRUE -if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then -libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu = 0.9.18]) -else -libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz = 0.9.10]) -fi +libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu = 0.9.18]) else AC_MSG_RESULT([no]) fi diff --git a/download.lst b/download.lst index b8259aa..f859583 100644 --- a/download.lst +++ b/download.lst @@ -10,6 +10,8 @@ FIREBIRD_MD5SUM := 21154d2004e025c8a325b0357bb5 export FIREBIRD_TARBALL := Firebird-2.5.2.26540-0.tar.bz2 # FIREBIRD_MD5SUM := b259c2d1c60a03bd104108405ae990a7 # export FIREBIRD_TARBALL := Firebird-3.0-alpha1-20130302.tar.gz +HARFBUZZ_MD5SUM := 9782581ee6ef972554772e84ca448131 +export HARFBUZZ_TARBALL := harfbuzz-0.9.19.tar.bz2 LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip @@ -44,7 +46,6 @@ export GRAPHITE_TARBALL := f5ef3f7f10fa8c3542c6a085a233080b-graphite2-1.2.0.tgz export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz -export HARFBUZZ_TARBALL := c48827713e93539dc7285f9e86ffbdc5-harfbuzz-0.9.17.tar.bz2 export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz export ICU_TARBALL := 6eef33b229d0239d654983028c9c7053-icu4c-51_1-src.tgz export ICU_51_LAYOUT_FIX_TARBALL := 7650341b04f05ff2595bf064f3e41f41-icu-51-layout-fix-10107.tgz diff --git a/harfbuzz/ExternalPackage_harfbuzz.mk b/harfbuzz/ExternalPackage_harfbuzz.mk index cb3339d..e6420aa 100644 --- a/harfbuzz/ExternalPackage_harfbuzz.mk +++ b/harfbuzz/ExternalPackage_harfbuzz.mk @@ -11,7 +11,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,harfbuzz,harfbuzz)) $(eval $(call gb_ExternalPackage_use_external_project,harfbuzz,harfbuzz)) -$(eval $(call gb_ExternalPackage_add_file,harfbuzz,lib/libharfbuzz.a,src/.libs/libharfbuzz.a)) +$(eval $(call gb_ExternalPackage_add_files,harfbuzz,lib,\ + src/.libs/libharfbuzz.a \ +
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/drivers/firebird/Table.cxx | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 0d6d62a559e02c7468040dafc432c419e8fb7228
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date: Thu Aug 15 10:15:09 2013 +0100
Implement column-type alteration. (firebird-sdbc)
Change-Id: Id192bd7d62d0ce9d5abc04390670cb277c6ec755
diff --git a/connectivity/source/drivers/firebird/Table.cxx
b/connectivity/source/drivers/firebird/Table.cxx
index d32066f..3f99917 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -11,6 +11,7 @@
#include Table.hxx
#include comphelper/sequence.hxx
+#include connectivity/dbtools.hxx
#include connectivity/TIndexes.hxx
#include connectivity/TKeys.hxx
@@ -115,7 +116,16 @@ void SAL_CALL Table::alterColumnByName(const OUString
rColName,
getConnection()-createStatement()-execute(sSql);
}
-if (bTypeChanged || bTypeNameChanged || bPrecisionChanged || bScaleChanged
+if (bTypeChanged || bTypeNameChanged)
+{
+OUString sSql(getAlterTableColumn(rColName) + TYPE +
+::dbtools::createStandardTypePart(rDescriptor,
getConnection()));
+getConnection()-createStatement()-execute(sSql);
+// TODO: could cause errors e.g. if incompatible types, deal with them
here as appropriate.
+// possibly we have to wrap things in Util::evaluateStatusVector.
+}
+
+if (bPrecisionChanged || bScaleChanged
|| bIsNullableChanged || bIsAutoIncrementChanged)
{
// TODO: changeType
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/bin
solenv/bin/packimages.pl |9 -
1 file changed, 9 deletions(-)
New commits:
commit 65431ce126b01f3812c81557f8da0085a8bbb6ee
Author: Tor Lillqvist t...@iki.fi
Date: Mon Aug 19 12:19:22 2013 +0300
Reduce verbosity: Don't print annoying warnings
Tons of these warnings were printed during the build, and nobody
cared, so they can't be that serious, can they?
Change-Id: Iecad7d8f6c562d04c5360161387212efef59b889
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 3e7015b..09e19db 100644
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -456,7 +456,6 @@ sub read_links($$)
my $fname = $path/links.txt;
if (!-f $fname) {
-print STDERR no links in $fname\n;
return;
}
@@ -516,14 +515,6 @@ sub remove_links_from_zip_list($$)
for my $link (keys %{$links}) {
if (defined $zip_hash_ref-{$link}) {
delete $zip_hash_ref-{$link};
-} else {
-print STDERR Note: redundant '$link' - ' .
- $links-{$link} . ' not found in filelist\n;
-}
-my $target = $links-{$link};
-if (!defined $zip_hash_ref-{$target}) {
-print STDERR Warning: link '$link' to missing icon ' .
- $links-{$link} . '\n;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icon-themes/galaxy
icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png |1 - icon-themes/galaxy/cmd/lc_objectmirrorvertical.png |1 - 2 files changed, 2 deletions(-) New commits: commit 745179a6336e1a56507f7211ed259c59f91dd1cc Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 19 12:28:16 2013 +0300 Remove bogus symlinks (!) to /data/git/libreoffice/... paths Change-Id: I13a819829f1aa6ac3cdf2e3aa1237af170610f80 diff --git a/icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png b/icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png deleted file mode 12 index bf3e205..000 --- a/icon-themes/galaxy/cmd/lc_objectmirrorhorizontal.png +++ /dev/null @@ -1 +0,0 @@ -/data/git/libreoffice/icon-themes/galaxy/cmd/lc_fliphorizontal.png \ No newline at end of file diff --git a/icon-themes/galaxy/cmd/lc_objectmirrorvertical.png b/icon-themes/galaxy/cmd/lc_objectmirrorvertical.png deleted file mode 12 index 9c9ca97..000 --- a/icon-themes/galaxy/cmd/lc_objectmirrorvertical.png +++ /dev/null @@ -1 +0,0 @@ -/data/git/libreoffice/icon-themes/galaxy/cmd/lc_flipvertical.png \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 58b64704327190dc5c09d22cd329970ec0094477
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Aug 19 11:26:49 2013 +0200
Windows includes in lowercase, guys\! :)
Change-Id: I2c6f2553cd0a1657981de720b2398754253ec4d4
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
index 8326ea0..314e379 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
+++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h
@@ -264,7 +264,7 @@ extern C {
#includewindows.h
#includewinsock2.h
-#includeWs2tcpip.h
+#includews2tcpip.h
#if ( defined( _MSC_VER ) )
#pragma warning( default:4706 )
___
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 0ce1070ce7a5a502cc36cdeb6ebeab68700d33d8 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 10:45:59 2013 +0100 Updated core Project: help 8fad124be31b9f372454c7bb68cbd293f06d4e1c diff --git a/helpcontent2 b/helpcontent2 index 00ceae6..8fad124 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 00ceae6cf10ed0f4e0165acd0f0cadd54b19c06b +Subproject commit 8fad124be31b9f372454c7bb68cbd293f06d4e1c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst| 16 --- source/text/swriter/01/04090003.xhp | 50 ++-- 2 files changed, 25 insertions(+), 41 deletions(-) New commits: commit 8fad124be31b9f372454c7bb68cbd293f06d4e1c Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 10:45:59 2013 +0100 update help ids for fld function page .ui conversion Change-Id: Ibb20352693522548d1e9375ae4560e9e20996b75 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 90cec9a..fe7bd43 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1737,7 +1737,6 @@ HID_FLDVAR_DELETE,53048, HID_FLD_DB,53205, HID_FLD_DOK,53208, HID_FLD_DROPDOWN,54954, -HID_FLD_FUNC,53209, HID_FLD_REF,53210, HID_FLD_VAR,53207, HID_FM_CTL_SELECTION,59884, @@ -7515,12 +7514,6 @@ sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY,1435322396, sw_Edit_TP_FLD_DB_ED_DBCONDITION,878708744, sw_Edit_TP_FLD_DB_ED_DBSETNUMBER,878708745, sw_Edit_TP_FLD_DOK_ED_DOKVALUE,878757943, -sw_Edit_TP_FLD_FUNC_ED_FUNCCOND1,878774347, -sw_Edit_TP_FLD_FUNC_ED_FUNCCOND2,878774349, -sw_Edit_TP_FLD_FUNC_ED_FUNCNAME,878774343, -sw_Edit_TP_FLD_FUNC_ED_FUNCVALUE,878774345, -sw_Edit_TP_FLD_FUNC_ED_LISTITEM,878774353, -sw_Edit_TP_FLD_FUNC_ED_LISTNAME,878774361, sw_Edit_TP_FLD_REF_ED_REFNAME,878790744, sw_Edit_TP_FLD_REF_ED_REFVALUE,878790746, sw_Edit_TP_FLD_VAR_ED_VARNAME,878741535, @@ -7594,10 +7587,6 @@ sw_ListBox_TP_FLD_DOK_LB_DOKFORMAT,878759476, sw_ListBox_TP_FLD_DOK_LB_DOKNUMFORMAT,878759475, sw_ListBox_TP_FLD_DOK_LB_DOKSELECTION,878759474, sw_ListBox_TP_FLD_DOK_LB_DOKTYPE,878759472, -sw_ListBox_TP_FLD_FUNC_LB_FUNCFORMAT,878775877, -sw_ListBox_TP_FLD_FUNC_LB_FUNCSELECTION,878775874, -sw_ListBox_TP_FLD_FUNC_LB_FUNCTYPE,878775873, -sw_ListBox_TP_FLD_FUNC_LB_LISTITEMS,878775892, sw_ListBox_TP_FLD_REF_LB_REFFORMAT,878792277, sw_ListBox_TP_FLD_REF_LB_REFSELECTION,878792275, sw_ListBox_TP_FLD_REF_LB_REFTYPE,878792273, @@ -7764,11 +7753,6 @@ sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820, sw_PushButton_TP_CONDCOLL_PB_ASSIGN,878449162, sw_PushButton_TP_CONDCOLL_PB_REMOVE,878449161, sw_PushButton_TP_FLD_DB_PB_ADDDB,878711313, -sw_PushButton_TP_FLD_FUNC_BT_FUNCMACRO,878776910, -sw_PushButton_TP_FLD_FUNC_PB_LISTADD,878776914, -sw_PushButton_TP_FLD_FUNC_PB_LISTDOWN,878776919, -sw_PushButton_TP_FLD_FUNC_PB_LISTREMOVE,878776917, -sw_PushButton_TP_FLD_FUNC_PB_LISTUP,878776918, sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213, sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288, sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287, diff --git a/source/text/swriter/01/04090003.xhp b/source/text/swriter/01/04090003.xhp index 32b6c3a..a2d055c 100644 --- a/source/text/swriter/01/04090003.xhp +++ b/source/text/swriter/01/04090003.xhp @@ -28,17 +28,17 @@ /meta body section id=funktionen -bookmark xml-lang=en-US branch=hid/SW_HID_FLD_FUNC id=bm_id3156382 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/fldfuncpage/FldFuncPage id=bm_id3156382 localize=false/ paragraph role=heading id=hd_id3149123 xml-lang=en-US level=1 l10n=U oldref=1link href=text/swriter/01/04090003.xhp name=FunctionsFunctions/link/paragraph -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_FLD_FUNC:ED_FUNCNAME id=bm_id3149875 localize=false/ -bookmark xml-lang=en-US branch=hid/sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE id=bm_id3150251 localize=false/ -paragraph role=paragraph id=par_id3150343 xml-lang=en-US l10n=U oldref=45ahelp hid=SW_EDIT_TP_FLD_FUNC_ED_FUNCVALUE visibility=hiddenSets additional function parameters for fields. The type of parameter depends on the field type that you select./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/fldfuncpage/name id=bm_id3149875 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/fldfuncpage/value id=bm_id3150251 localize=false/ +paragraph role=paragraph id=par_id3150343 xml-lang=en-US l10n=U oldref=45ahelp hid=modules/swriter/ui/fldfuncpage/value visibility=hiddenSets additional function parameters for fields. The type of parameter depends on the field type that you select./ahelp/paragraph paragraph role=paragraph id=par_id3151242 xml-lang=en-US l10n=U oldref=2Depending on the field type that you select, you can assign conditions to certain functions. For example, you can define a field that executes a macro when you click the field in the document, or a condition that, when met, hides a field. You can also define placeholder fields that insert graphics, tables, frames and other objects into your document when needed./paragraph /section section id=howtoget embed href=text/swriter/00/0404.xhp#feldfunktionen/ /section -bookmark xml-lang=en-US branch=hid/sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE id=bm_id3146964 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/fldfuncpage/type id=bm_id3146964 localize=false/ paragraph role=paragraph id=par_id0902200804352037 xml-lang=en-US l10n=NEWahelp
[Libreoffice-commits] core.git: 2 commits - cui/source cui/uiconfig sw/uiconfig
cui/source/tabpages/transfrm.hrc |1 - cui/uiconfig/ui/possizetabpage.ui | 20 sw/uiconfig/swriter/ui/fldfuncpage.ui |5 - 3 files changed, 16 insertions(+), 10 deletions(-) New commits: commit 1e689e18701a21728dd2b02ea459a62fec5b561e Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:04:36 2013 +0100 tweak a bit Change-Id: Ic2ea51faf0fcec0a7d6fdc4a52e2e930e8461e20 diff --git a/cui/source/tabpages/transfrm.hrc b/cui/source/tabpages/transfrm.hrc index 36535ad..72feeb7 100644 --- a/cui/source/tabpages/transfrm.hrc +++ b/cui/source/tabpages/transfrm.hrc @@ -53,7 +53,6 @@ #define FT_REFERENCE37 #define FT_POSPRESETS 38 #define FT_ANGLEPRESETS 39 -#define LB_ORIENT 40 #define FT_SIZEREFERENCE41 #define CTL_SIZERECT42 #define FT_POSREFERENCE 43 diff --git a/cui/uiconfig/ui/possizetabpage.ui b/cui/uiconfig/ui/possizetabpage.ui index bf5fc3d..4482675 100644 --- a/cui/uiconfig/ui/possizetabpage.ui +++ b/cui/uiconfig/ui/possizetabpage.ui @@ -7,7 +7,7 @@ property name=can_focusFalse/property property name=border_width6/property property name=orientationvertical/property -property name=spacing6/property +property name=spacing12/property child object class=GtkFrame id=FL_POSITION property name=visibleTrue/property @@ -124,6 +124,7 @@ object class=svxlo-SvxRectCtl id=CTL_POSRECT property name=visibleTrue/property property name=can_focusFalse/property +property name=halignstart/property /object packing property name=expandFalse/property @@ -259,13 +260,10 @@ packing property name=left_attach0/property property name=top_attach2/property -property name=width1/property +property name=width2/property property name=height1/property /packing /child -child - placeholder/ -/child /object packing property name=expandFalse/property @@ -298,6 +296,7 @@ object class=svxlo-SvxRectCtl id=CTL_SIZERECT property name=visibleTrue/property property name=can_focusFalse/property +property name=halignstart/property /object packing property name=expandFalse/property @@ -514,9 +513,14 @@ widget name=FT_POS_Y/ widget name=FT_WIDTH/ widget name=FT_HEIGHT/ - widget name=CBX_SCALE/ - widget name=TSB_POSPROTECT/ - widget name=TSB_SIZEPROTECT/ +/widgets + /object + object class=GtkSizeGroup id=sizegroup2 +widgets + widget name=MTR_FLD_POS_X:0.00cm/ + widget name=MTR_FLD_POS_Y:0.00cm/ + widget name=MTR_FLD_WIDTH:0.00cm/ + widget name=MTR_FLD_HEIGHT:0.00cm/ /widgets /object /interface commit 7ed90fdf548978d640a7ed26ffda99c10586aac9 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 10:59:16 2013 +0100 wrong mnemonic widget Change-Id: I539fb2599743ed2eda3b33895f73230cc2342055 diff --git a/sw/uiconfig/swriter/ui/fldfuncpage.ui b/sw/uiconfig/swriter/ui/fldfuncpage.ui index 83d4277..e5f77b3 100644 --- a/sw/uiconfig/swriter/ui/fldfuncpage.ui +++ b/sw/uiconfig/swriter/ui/fldfuncpage.ui @@ -428,6 +428,9 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=hexpandTrue/property +child internal-child=selection + object class=GtkTreeSelection id=treeview-selection5/ +/child /object packing property name=left_attach0/property @@ -507,7 +510,7 @@ property name=xalign0/property property name=label translatable=yesNa_me/property property name=use_underlineTrue/property -property name=mnemonic_widgetname/property +property name=mnemonic_widgetlistname/property /object packing property name=left_attach0/property ___ 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/crsr/bookmrk.cxx |2 ++
sw/source/core/doc/docbm.cxx | 13 +++--
sw/source/core/inc/bookmrk.hxx |5 +
sw/source/ui/dochdl/swdtflvr.cxx | 22 --
4 files changed, 30 insertions(+), 12 deletions(-)
New commits:
commit bf1b5979d2ce88265e73ee8fd11599a4374c4136
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Mon Aug 19 08:20:05 2013 +
122902, 122922, 122992: - MarkManager::deleteMark(..) - assure that entry
is removed from stl container before its deletion is triggered.
- SwTrnsfrDdeLink::Disconnect(..) - do not delete DDE bookmark when it is
already in its destruction
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 36f7736..e6d5dce 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -187,6 +187,7 @@ namespace sw { namespace mark
DdeBookmark::DdeBookmark(const SwPaM aPaM)
: MarkBase(aPaM, MarkBase::GenerateNewName(our_sNamePrefix))
, m_aRefObj(NULL)
+, mbInDestruction( false )
{ }
void DdeBookmark::SetRefObject(SwServerObject* pObj)
@@ -204,6 +205,7 @@ namespace sw { namespace mark
DdeBookmark::~DdeBookmark()
{
+mbInDestruction = true;
if( m_aRefObj.Is() )
{
if(m_aRefObj-HasDataLinks())
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index d4dcdcf..ad88fb6 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -734,9 +734,18 @@ namespace sw { namespace mark
break;
}
DdeBookmark* const pDdeBookmark =
dynamic_castDdeBookmark*(ppMark-get());
-if(pDdeBookmark)
+if ( pDdeBookmark )
+{
pDdeBookmark-DeregisterFromDoc(m_pDoc);
-m_vMarks.erase(m_vMarks.begin() + (ppMark - m_vMarks.begin())); //
clumsy const-cast
+}
+// keep a temporary instance of the to-be-deleted mark in order to
avoid
+// recursive deletion of the mark triggered via its destructor.
+// the temporary hold instance assures that the mark is deleted after
the
+// mark container has been updated. Thus, the mark could not be found
anymore
+// in the mark container by other calls trying to recursively delete
the mark.
+iterator_t aToBeDeletedMarkIter = m_vMarks.begin() + (ppMark -
m_vMarks.begin());
+pMark_t pToBeDeletedMark = *aToBeDeletedMarkIter;
+m_vMarks.erase( aToBeDeletedMarkIter );
}
void MarkManager::deleteMark(const IMark* const pMark)
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 92df083..aabf6dd 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -159,8 +159,13 @@ namespace sw { namespace mark
void DeregisterFromDoc(SwDoc* const pDoc);
virtual ~DdeBookmark();
+inline bool IsInDestruction() const
+{
+return mbInDestruction;
+}
private:
SwServerObjectRef m_aRefObj;
+bool mbInDestruction;
static const ::rtl::OUString our_sNamePrefix;
};
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 2f72917..08e4c2d 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -87,6 +87,7 @@
#include IDocumentUndoRedo.hxx
#include pagedesc.hxx
#include IMark.hxx
+#include bookmrk.hxx
#include docary.hxx
#include section.hxx
#include ndtxt.hxx
@@ -3771,12 +3772,6 @@ sal_Bool SwTrnsfrDdeLink::WriteData( SvStream rStrm )
rStrm.Write( pMem, nLen );
delete[] pMem;
-//if( bDelBookmrk )
-//{
-// // er wird das erstemal abgeholt, also ins Undo mitaufnehmen
-// // aber wie??
-//}
-
IDocumentMarkAccess* const pMarkAccess =
pDocShell-GetDoc()-getIDocumentMarkAccess();
IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-findMark(sName);
if(ppMark != pMarkAccess-getMarksEnd()
@@ -3822,7 +3817,7 @@ void SwTrnsfrDdeLink::Disconnect( sal_Bool
bRemoveDataAdvise )
// kein DataChanged mehr entgegen nehmen, wenn man
// sich schon im Disconnet befindet!
// (DTOR vom Bookmark verschickt einen DataChanged!)
-sal_Bool bOldDisconnect = bInDisconnect;
+const sal_Bool bOldDisconnect = bInDisconnect;
bInDisconnect = sal_True;
// den nicht verwendeten Bookmark wieder zerstoeren (ohne Undo!)?
@@ -3838,13 +3833,20 @@ void SwTrnsfrDdeLink::Disconnect( sal_Bool
bRemoveDataAdvise )
sal_Bool bIsModified = pDoc-IsModified();
IDocumentMarkAccess* const pMarkAccess =
pDoc-getIDocumentMarkAccess();
-pMarkAccess-deleteMark(pMarkAccess-findMark(sName));
+// check, if DdeBookmark is already in its desctruction
+IDocumentMarkAccess::const_iterator_t ppMark =
pMarkAccess-findMark(sName);
+if ( ppMark !=
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 12 source/text/shared/01/05230100.xhp | 53 ++--- 2 files changed, 27 insertions(+), 38 deletions(-) New commits: commit f8a660c3c6850535ab48c0a9536229ac374255c2 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:13:35 2013 +0100 convert help ids for pos size page .ui conversion Change-Id: I1f3839650b133c574025e6ae194d3c765d9f7b44 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index fe7bd43..69a1e79 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3811,7 +3811,6 @@ HID_TP_CUSTOMPROPERTIES,33392, HID_TP_TOX_ENTRY,53240, HID_TP_TOX_SELECT,53239, HID_TRANS_ANGLE,33780, -HID_TRANS_POSITION_SIZE,34196, HID_TRANS_SLANT,33781, HID_TXTFOOTER,41145, HID_TXTSENDERCITY,41141, @@ -6807,7 +6806,6 @@ svx_CheckBox_RID_SVXPAGE_FOOTER_CB_TURNON,701137930, svx_CheckBox_RID_SVXPAGE_HYPERLINK_INTERNET_CBX_ANONYMOUS,704447499, svx_CheckBox_RID_SVXPAGE_LINE_DEF_CBX_SYNCHRONIZE,701563905, svx_CheckBox_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE,704857099, -svx_CheckBox_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE,702137366, svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_AUTO,700810288, svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_REGISTER,700810324, svx_CheckBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_CBX_PREVIEW,706675715, @@ -7059,8 +7057,6 @@ svx_ListBox_RID_SVXPAGE_LINE_DEF_LB_TYPE_2,701566465, svx_ListBox_RID_SVXPAGE_MEASURE_LB_UNIT,703352321, svx_ListBox_RID_SVXPAGE_MENUS_LB_MENUS,705498935, svx_ListBox_RID_SVXPAGE_MENUS_LB_SAVEIN,705498948, -svx_ListBox_RID_SVXPAGE_POSITION_SIZE_LB_ANCHOR,702139939, -svx_ListBox_RID_SVXPAGE_POSITION_SIZE_LB_ORIENT,702139944, svx_ListBox_RID_SVXPAGE_SHADOW_LB_SHADOW_COLOR,701713930, svx_ListBox_RID_SVXPAGE_STD_PARAGRAPH_LB_LINEDIST,700812840, svx_ListBox_RID_SVXTBX_UNDO_REDO_CTRL_LB_SVXTBX_UNDO_REDO_CTRL,1788300811, @@ -7137,10 +7133,6 @@ svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE2_LEN,703355397, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_DIST,703355395, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_OVERHANG,703355394, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_LINE_DIST,703355393, -svx_MetricField_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_HEIGHT,702142994, -svx_MetricField_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_X,702142983, -svx_MetricField_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_Y,702142984, -svx_MetricField_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_WIDTH,702142993, svx_MetricField_RID_SVXPAGE_SHADOW_MTR_FLD_DISTANCE,701716993, svx_MetricField_RID_SVXPAGE_SHADOW_MTR_SHADOW_TRANSPARENT,701717003, svx_MetricField_RID_SVXPAGE_SLANT_MTR_FLD_ANGLE,701520403, @@ -7415,10 +7407,6 @@ svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_AUTOPOSV,703350275, svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_BELOW_REF_EDGE,703350273, svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_PARALLEL,703350277, svx_TriStateBox_RID_SVXPAGE_MEASURE_TSB_SHOW_UNIT,703350274, -svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_HEIGHT,702137868, -svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH,702137869, -svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT,702137901, -svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_SIZEPROTECT,702137902, svx_TriStateBox_RID_SVXPAGE_SHADOW_TSB_SHOW_SHADOW,701711874, sw_CheckBox_DLG_AP_INSERT_DB_SEL_CB_TABLE_HEADON,1435042844, sw_CheckBox_DLG_GLOSSARY_CB_FILE_REL,1428636740, diff --git a/source/text/shared/01/05230100.xhp b/source/text/shared/01/05230100.xhp index 7280ef7..6c6cb32 100644 --- a/source/text/shared/01/05230100.xhp +++ b/source/text/shared/01/05230100.xhp @@ -39,6 +39,7 @@ bookmark_valueanchors;types/positions for draw objects/bookmark_value bookmark_valuedraw objects; anchoring/bookmark_value /bookmark +bookmark xml-lang=en-US branch=hid/cui/ui/possizetabpage/PositionAndSize id=bm_id3154185 localize=false/ paragraph role=heading id=hd_id3154350 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/05230100.xhp name=Position and SizePosition and Size/link/paragraph paragraph role=paragraph id=par_id3153255 xml-lang=en-US l10n=U oldref=2ahelp hid=.Resizes or moves the selected object./ahelp/paragraph /section @@ -47,58 +48,58 @@ /section paragraph role=heading id=hd_id3158405 xml-lang=en-US level=2 l10n=U oldref=3Position/paragraph paragraph role=paragraph id=par_id3159201 xml-lang=en-US l10n=U oldref=4Specify the location of the selected object on the page./paragraph -bookmark xml-lang=en-US branch=hid/cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X id=bm_id3154184 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/possizetabpage/MTR_FLD_POS_X id=bm_id3154184 localize=false/ paragraph role=heading id=hd_id3157896 xml-lang=en-US level=3 l10n=U oldref=5Position X/paragraph -paragraph role=paragraph id=par_id3155616 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX_METRICFIELD_RID_SVXPAGE_POSITION_SIZE_MTR_FLD_POS_XEnter the horizontal distance that you want to move the object relative to the
[Libreoffice-commits] core.git: 2 commits - cui/source helpcontent2
cui/source/inc/helpid.hrc |2 -- helpcontent2 |2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit 81f14df66d64f869ac481219ad1e441f089579de Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:14:28 2013 +0100 drop unused help ids Change-Id: I3c660679852afee5fc6684f4ea94445ce1ec8423 diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 363590b..be0f17e 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -209,11 +209,9 @@ #define HID_HANGULHANJA_EDIT_DLG CUI_HID_HANGULHANJA_EDIT_DLG #define HID_HANGULHANJA_OPT_DICTS_LB CUI_HID_HANGULHANJA_OPT_DICTS_LB #define HID_MULTIPATH CUI_HID_MULTIPATH -#define HID_TPSIZE_CTRL CUI_HID_TPSIZE_CTRL #define HID_TPROTATION_CTRL1 CUI_HID_TPROTATION_CTRL1 #define HID_TPROTATION_CTRL2 CUI_HID_TPROTATION_CTRL2 #define HID_TRANS_ANGLE CUI_HID_TRANS_ANGLE -#define HID_TPPOSITION_CTRL CUI_HID_TPPOSITION_CTRL #define HID_TRANS_SLANT CUI_HID_TRANS_SLANT #define HID_TPHATCH_CTRL CUI_HID_TPHATCH_CTRL #define HID_SEARCHATTR_CTL_ATTR CUI_HID_SEARCHATTR_CTL_ATTR commit e5de1c7a56ff85cb267358fd6d0d151cae02b73c Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:13:35 2013 +0100 Updated core Project: help f8a660c3c6850535ab48c0a9536229ac374255c2 diff --git a/helpcontent2 b/helpcontent2 index 8fad124..f8a660c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8fad124be31b9f372454c7bb68cbd293f06d4e1c +Subproject commit f8a660c3c6850535ab48c0a9536229ac374255c2 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/inc/helpid.hrc |1
cui/source/inc/transfrm.hxx | 10 --
cui/source/tabpages/transfrm.cxx | 55 +--
cui/source/tabpages/transfrm.src | 68 -
cui/uiconfig/ui/slantcornertabpage.ui | 170 ++
6 files changed, 200 insertions(+), 105 deletions(-)
New commits:
commit be49b8052489b788046d7250ed851408be759900
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Sun Aug 18 22:41:40 2013 -0300
Convert slant Corner radius tabpage to Widget UI
Conflicts:
cui/source/inc/helpid.hrc
Change-Id: Id0a51421e7d6cb7e0d0265f88de31ff3d9c574ec
Reviewed-on: https://gerrit.libreoffice.org/5505
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 833212d..e1ebd93 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -103,6 +103,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
cui/uiconfig/ui/shadowtabpage \
+ cui/uiconfig/ui/slantcornertabpage \
cui/uiconfig/ui/specialcharacters \
cui/uiconfig/ui/spellingdialog \
cui/uiconfig/ui/splitcellsdialog \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index be0f17e..3d123ec 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -212,7 +212,6 @@
#define HID_TPROTATION_CTRL1 CUI_HID_TPROTATION_CTRL1
#define HID_TPROTATION_CTRL2 CUI_HID_TPROTATION_CTRL2
#define HID_TRANS_ANGLE CUI_HID_TRANS_ANGLE
-#define HID_TRANS_SLANT CUI_HID_TRANS_SLANT
#define HID_TPHATCH_CTRL CUI_HID_TPHATCH_CTRL
#define HID_SEARCHATTR_CTL_ATTR CUI_HID_SEARCHATTR_CTL_ATTR
#define HID_SEARCHATTR CUI_HID_SEARCHATTR
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index bc474fc..a375418 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -230,12 +230,10 @@ class SvxSlantTabPage : public SvxTabPage
using TabPage::DeactivatePage;
private:
-FixedLine aFlRadius;
-FixedText aFtRadius;
-MetricField aMtrRadius;
-FixedLine aFlAngle;
-FixedText aFtAngle;
-MetricField aMtrAngle;
+VclFrame*m_pFlRadius;
+MetricField* m_pMtrRadius;
+VclFrame*m_pFlAngle;
+MetricField* m_pMtrAngle;
const SfxItemSet rOutAttrs;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 628efe3..c83e6c2 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -463,17 +463,16 @@ void SvxAngleTabPage::PointChanged(Window* pWindow,
RECT_POINT eRP)
\/
SvxSlantTabPage::SvxSlantTabPage( Window* pParent, const SfxItemSet rInAttrs
) :
-SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_SLANT ), rInAttrs
),
-
-aFlRadius ( this, CUI_RES( FL_RADIUS ) ),
-aFtRadius ( this, CUI_RES( FT_RADIUS ) ),
-aMtrRadius ( this, CUI_RES( MTR_FLD_RADIUS ) ),
-aFlAngle( this, CUI_RES( FL_SLANT ) ),
-aFtAngle( this, CUI_RES( FT_ANGLE ) ),
-aMtrAngle ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+SvxTabPage ( pParent
+ ,SlantAndCornerRadius
+ ,cui/ui/slantcornertabpage.ui
+ , rInAttrs ),
rOutAttrs ( rInAttrs )
{
-FreeResource();
+get(m_pFlRadius, FL_RADIUS);
+get(m_pMtrRadius, MTR_FLD_RADIUS);
+get(m_pFlAngle, FL_SLANT);
+get(m_pMtrAngle, MTR_FLD_ANGLE);
// this page needs ExchangeSupport
SetExchangeSupport();
@@ -491,7 +490,7 @@ void SvxSlantTabPage::Construct()
// get the range
DBG_ASSERT(pView, no valid view (!));
eDlgUnit = GetModuleFieldUnit(GetItemSet());
-SetFieldUnit(aMtrRadius, eDlgUnit, sal_True);
+SetFieldUnit(*m_pMtrRadius, eDlgUnit, sal_True);
{ // #i75273#
Rectangle aTempRect(pView-GetAllMarkedRect());
@@ -505,23 +504,23 @@ void SvxSlantTabPage::Construct()
sal_Bool SvxSlantTabPage::FillItemSet(SfxItemSet rAttrs)
{
sal_Bool bModified = sal_False;
-String aStr = aMtrRadius.GetText();
+String aStr = m_pMtrRadius-GetText();
-if( aStr != aMtrRadius.GetSavedValue() )
+if( aStr != m_pMtrRadius-GetSavedValue() )
{
Fraction aUIScale = pView-GetModel()-GetUIScale();
-long nTmp = GetCoreValue( aMtrRadius, ePoolUnit );
+long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit );
nTmp = Fraction( nTmp ) * aUIScale;
rAttrs.Put( SdrEckenradiusItem( nTmp ) );
bModified = sal_True;
}
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua vcl/Library_vcl.mk
vcl/Library_vcl.mk |4
vcl/aqua/source/app/salinst.cxx |2 ++
2 files changed, 6 insertions(+)
New commits:
commit 7aa6eaa8b27aea6d52875d1a7d7994b3ca3e5904
Author: Tor Lillqvist t...@iki.fi
Date: Mon Aug 19 10:32:34 2013 +0300
fdo#39007: Brute force fix: Unlink a potential restorecount.plist file
It is not completely clear to me whether we really still might be
leaving such files around. After all, we do tell our NSWindows to not
be restorable... Norbert's code in AquaSalFrame::initWindowAndView().
On the other hand, Cocoa does seem to create the file and keep it
around for a short while before removing it (in responce to our
setRestorable:NO calls?), so there is a slight time window where if LO
crashes, the file will be left around.
Such a file might also be around from an older LO version, or manually
planted there by somebody wanting to reproduce the bug...
Of course, the *real* fix for this problem would be to make LO a
*proper* Cocoa document centric application, that would use
NSDocument, NSApplication etc like native applications are supposed
to, and that *would* handle window restoration the Cocoa way. I.e.,
work with the system instead of against it. Maybe some day, but
obviously not here in this branch.
(cherry picked from commit bd507a0d093b7d5239992440a40d0a7453b38207)
Change-Id: I9ed058130f49cf0221d899bef3e2654589c7
Reviewed-on: https://gerrit.libreoffice.org/5509
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 0669590..4e3df9b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -356,6 +356,10 @@ $(eval $(call gb_Library_add_cxxflags,vcl,\
$(gb_OBJCXXFLAGS) \
))
+$(eval $(call gb_Library_add_defs,vcl,\
+ -DMACOSX_BUNDLE_IDENTIFIER=\$(MACOSX_BUNDLE_IDENTIFIER)\ \
+))
+
ifeq ($(ENABLE_CORETEXT),YES)
$(eval $(call gb_Library_add_defs,vcl,\
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 5f033f2..790b987 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -197,6 +197,8 @@ static void initNSApp()
sal_Bool ImplSVMainHook( int * pnInit )
{
+unlink([[NSString stringWithFormat:@%@/Library/Saved Application
State/%s.savedState/restorecount.plist, NSHomeDirectory(),
MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
+
gpnInit = pnInit;
bNoSVMain = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |3 --- source/text/shared/01/05230400.xhp | 12 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) New commits: commit d2c983410d61bd286667b89f5d8d44244bb463c0 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:24:03 2013 +0100 update help ids for slant/corner tab page .ui conversion Change-Id: Ib6d7581de262c7d7be9f6a47753ae82f019e diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 69a1e79..8ca2f96 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3811,7 +3811,6 @@ HID_TP_CUSTOMPROPERTIES,33392, HID_TP_TOX_ENTRY,53240, HID_TP_TOX_SELECT,53239, HID_TRANS_ANGLE,33780, -HID_TRANS_SLANT,33781, HID_TXTFOOTER,41145, HID_TXTSENDERCITY,41141, HID_TXTSENDERFAX,41142, @@ -7135,8 +7134,6 @@ svx_MetricField_RID_SVXPAGE_MEASURE_MTR_FLD_HELPLINE_OVERHANG,703355394, svx_MetricField_RID_SVXPAGE_MEASURE_MTR_LINE_DIST,703355393, svx_MetricField_RID_SVXPAGE_SHADOW_MTR_FLD_DISTANCE,701716993, svx_MetricField_RID_SVXPAGE_SHADOW_MTR_SHADOW_TRANSPARENT,701717003, -svx_MetricField_RID_SVXPAGE_SLANT_MTR_FLD_ANGLE,701520403, -svx_MetricField_RID_SVXPAGE_SLANT_MTR_FLD_RADIUS,701520413, svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_BOTTOMDIST,700815895, svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_FLINEINDENT,700815885, svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_LEFTINDENT,700815883, diff --git a/source/text/shared/01/05230400.xhp b/source/text/shared/01/05230400.xhp index c5cb63a..e31369b 100644 --- a/source/text/shared/01/05230400.xhp +++ b/source/text/shared/01/05230400.xhp @@ -37,22 +37,22 @@ bookmark_valuedraw objects; slanting/bookmark_value bookmark_valueareas; slanting/bookmark_value /bookmarkcommentmw made slanting;... a one level entry/comment -bookmark xml-lang=en-US branch=hid/CUI_HID_TRANS_SLANT id=bm_id3143272 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/slantcornertabpage/SlantAndCornerRadius id=bm_id3143272 localize=false/ paragraph role=heading id=hd_id3149988 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/05230400.xhp name=Slant amp; Corner RadiusSlant amp; Corner Radius/link/paragraph -paragraph role=paragraph id=par_id3154788 xml-lang=en-US l10n=U oldref=2ahelp hid=HID_TRANS_SLANTSlants the selected object, or rounds the corners of a rectangular object./ahelp/paragraph +paragraph role=paragraph id=par_id3154788 xml-lang=en-US l10n=U oldref=2ahelp hid=cui/ui/slantcornertabpage/SlantAndCornerRadiusSlants the selected object, or rounds the corners of a rectangular object./ahelp/paragraph /section section id=howtoget embed href=text/shared/00/00040502.xhp#ecke/ /section paragraph role=heading id=hd_id3154497 xml-lang=en-US level=2 l10n=U oldref=3Corner Radius/paragraph paragraph role=paragraph id=par_id3156027 xml-lang=en-US l10n=U oldref=4You can only round the corners of a rectangular object./paragraph -bookmark xml-lang=en-US branch=hid/cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS id=bm_id3156042 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/slantcornertabpage/MTR_FLD_RADIUS id=bm_id3156042 localize=false/ paragraph role=heading id=hd_id3153935 xml-lang=en-US level=3 l10n=U oldref=5Radius/paragraph -paragraph role=paragraph id=par_id3147373 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_RADIUSEnter the radius of the circle that you want to use to round the corners./ahelp/paragraph +paragraph role=paragraph id=par_id3147373 xml-lang=en-US l10n=U oldref=6ahelp hid=cui/ui/slantcornertabpage/MTR_FLD_RADIUSEnter the radius of the circle that you want to use to round the corners./ahelp/paragraph paragraph role=heading id=hd_id3145090 xml-lang=en-US level=2 l10n=U oldref=7Slant/paragraph paragraph role=paragraph id=par_id3153345 xml-lang=en-US l10n=U oldref=8Slants the selected object along an axis that you specify./paragraph -bookmark xml-lang=en-US branch=hid/cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE id=bm_id3154318 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/slantcornertabpage/MTR_FLD_ANGLE id=bm_id3154318 localize=false/ paragraph role=heading id=hd_id3154983 xml-lang=en-US level=3 l10n=U oldref=9Angle/paragraph -paragraph role=paragraph id=par_id3153683 xml-lang=en-US l10n=U oldref=10ahelp hid=SVX:METRICFIELD:RID_SVXPAGE_SLANT:MTR_FLD_ANGLEEnter the angle of the slant axis./ahelp/paragraph +paragraph role=paragraph id=par_id3153683 xml-lang=en-US l10n=U oldref=10ahelp hid=cui/ui/slantcornertabpage/MTR_FLD_ANGLEEnter the angle of the slant axis./ahelp/paragraph /body /helpdocument ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/uiconfig helpcontent2
cui/uiconfig/ui/slantcornertabpage.ui |2 +- helpcontent2 |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 69a0571d6b885cc4771554d22a63170651647f3b Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:24:20 2013 +0100 some extra spacing between frames Change-Id: I94051d2f2c1bd4cce6945798f85e90d6b5316450 diff --git a/cui/uiconfig/ui/slantcornertabpage.ui b/cui/uiconfig/ui/slantcornertabpage.ui index 3c976ca..d7e2374 100644 --- a/cui/uiconfig/ui/slantcornertabpage.ui +++ b/cui/uiconfig/ui/slantcornertabpage.ui @@ -17,7 +17,7 @@ property name=can_focusFalse/property property name=border_width6/property property name=orientationvertical/property -property name=spacing6/property +property name=spacing12/property child object class=GtkFrame id=FL_RADIUS property name=visibleTrue/property commit 0c0210fbee8e33e6cfde81119b6913645a046a2c Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 11:24:03 2013 +0100 Updated core Project: help d2c983410d61bd286667b89f5d8d44244bb463c0 diff --git a/helpcontent2 b/helpcontent2 index f8a660c..d2c9834 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f8a660c3c6850535ab48c0a9536229ac374255c2 +Subproject commit d2c983410d61bd286667b89f5d8d44244bb463c0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - cppuhelper/source linguistic/source
cppuhelper/source/access_control.cxx |4 ++--
cppuhelper/source/bootstrap.cxx |5 +++--
cppuhelper/source/component_context.cxx |6 --
cppuhelper/source/exc_thrower.cxx |2 --
cppuhelper/source/implbase.cxx|3 ++-
cppuhelper/source/implbase_ex.cxx |5 -
cppuhelper/source/implementationentry.cxx |4 +++-
cppuhelper/source/macro_expander.cxx |5 +++--
cppuhelper/source/servicemanager.cxx |8
cppuhelper/source/shlib.cxx |6 --
cppuhelper/source/tdmgr.cxx |2 +-
cppuhelper/source/typemanager.cxx |2 +-
linguistic/source/gciterator.cxx |2 +-
13 files changed, 32 insertions(+), 22 deletions(-)
New commits:
commit e89e7cded7cf449807c93bd3ce35b1e1a876da3f
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 19 11:49:57 2013 +0200
Prefer using declarations over using directives
Change-Id: I1316fc4ae1d4dab91684bdc059f5c69c5e0c401a
diff --git a/cppuhelper/source/access_control.cxx
b/cppuhelper/source/access_control.cxx
index 5c39d73..1df5d2d 100644
--- a/cppuhelper/source/access_control.cxx
+++ b/cppuhelper/source/access_control.cxx
@@ -25,12 +25,12 @@
#include com/sun/star/io/FilePermission.hpp
#include com/sun/star/connection/SocketPermission.hpp
-
-using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using rtl::OUString;
+
namespace
{
inline OUString str_ac_singleton()
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 2de4b56..81d3420 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -44,12 +44,13 @@
#define ARLEN(x) sizeof (x) / sizeof *(x)
-
-using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using rtl::Bootstrap;
+using rtl::OUString;
+
namespace cppu
{
diff --git a/cppuhelper/source/component_context.cxx
b/cppuhelper/source/component_context.cxx
index 7d41778..f758912 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -60,12 +60,14 @@
#define TDMGR_SINGLETON
/singletons/com.sun.star.reflection.theTypeDescriptionManager
#define AC_SINGLETON /singletons/com.sun.star.security.theAccessController
-
using namespace ::osl;
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+using rtl::OUStringHash;
+
namespace cppu
{
diff --git a/cppuhelper/source/exc_thrower.cxx
b/cppuhelper/source/exc_thrower.cxx
index d63b9be..a7de5c8 100644
--- a/cppuhelper/source/exc_thrower.cxx
+++ b/cppuhelper/source/exc_thrower.cxx
@@ -29,8 +29,6 @@
#include cppuhelper/exc_hlp.hxx
-
-using namespace ::rtl;
using namespace ::osl;
using namespace ::cppu;
using namespace ::com::sun::star;
diff --git a/cppuhelper/source/implbase.cxx b/cppuhelper/source/implbase.cxx
index 4816c4a6..24a3b27 100644
--- a/cppuhelper/source/implbase.cxx
+++ b/cppuhelper/source/implbase.cxx
@@ -27,10 +27,11 @@
#include com/sun/star/uno/RuntimeException.hpp
using namespace ::osl;
-using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using rtl::OUString;
+
namespace
{
class theImplHelperInitMutex : public rtl::StaticMutex,
theImplHelperInitMutex{};
diff --git a/cppuhelper/source/implbase_ex.cxx
b/cppuhelper/source/implbase_ex.cxx
index b581807..30e4d08 100644
--- a/cppuhelper/source/implbase_ex.cxx
+++ b/cppuhelper/source/implbase_ex.cxx
@@ -30,10 +30,13 @@
using namespace ::cppu;
using namespace ::osl;
-using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
+using rtl::OString;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
namespace cppu
{
diff --git a/cppuhelper/source/implementationentry.cxx
b/cppuhelper/source/implementationentry.cxx
index 1ee5136..b6d9dd4 100644
--- a/cppuhelper/source/implementationentry.cxx
+++ b/cppuhelper/source/implementationentry.cxx
@@ -20,11 +20,13 @@
#include cppuhelper/implementationentry.hxx
#include rtl/ustrbuf.hxx
-using namespace ::rtl;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
+using rtl::OUString;
+using rtl::OUStringBuffer;
+
namespace cppu {
sal_Bool component_writeInfoHelper(
diff --git a/cppuhelper/source/macro_expander.cxx
b/cppuhelper/source/macro_expander.cxx
index 72ff90a..24708d9 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -38,12 +38,13 @@
#define SERVICE_NAME_B com.sun.star.lang.BootstrapMacroExpander
#define IMPL_NAME com.sun.star.lang.comp.cppuhelper.BootstrapMacroExpander
-
-using namespace ::rtl;
using namespace ::osl;
using namespace ::com::sun::star;
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk|1
cui/source/inc/helpid.hrc |3
cui/source/inc/transfrm.hxx| 21 --
cui/source/tabpages/transfrm.cxx | 118 +
cui/source/tabpages/transfrm.hrc | 43 -
cui/source/tabpages/transfrm.src | 118 -
cui/uiconfig/ui/possizetabpage.ui |6
cui/uiconfig/ui/rotationtabpage.ui | 316 +
8 files changed, 377 insertions(+), 249 deletions(-)
New commits:
commit 2a536842d7cecd3b5bdb09901f0fe829f6cf6d87
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date: Mon Aug 19 00:26:01 2013 -0300
Convert rotation tap page to widget UI
Conflicts:
cui/source/inc/helpid.hrc
cui/uiconfig/ui/slantcornertabpage.ui
Change-Id: Ifd2a18ad1a84728237de61bed3d96f83313afd62
Reviewed-on: https://gerrit.libreoffice.org/5506
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index e1ebd93..4e52967 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/querynoloadedfiledialog \
cui/uiconfig/ui/querynosavefiledialog \
cui/uiconfig/ui/querysavelistdialog \
+ cui/uiconfig/ui/rotationtabpage \
cui/uiconfig/ui/scriptorganizer \
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 3d123ec..e3d268c 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -209,9 +209,6 @@
#define HID_HANGULHANJA_EDIT_DLG CUI_HID_HANGULHANJA_EDIT_DLG
#define HID_HANGULHANJA_OPT_DICTS_LB CUI_HID_HANGULHANJA_OPT_DICTS_LB
#define HID_MULTIPATH CUI_HID_MULTIPATH
-#define HID_TPROTATION_CTRL1 CUI_HID_TPROTATION_CTRL1
-#define HID_TPROTATION_CTRL2 CUI_HID_TPROTATION_CTRL2
-#define HID_TRANS_ANGLE CUI_HID_TRANS_ANGLE
#define HID_TPHATCH_CTRL CUI_HID_TPHATCH_CTRL
#define HID_SEARCHATTR_CTL_ATTR CUI_HID_SEARCHATTR_CTL_ATTR
#define HID_SEARCHATTR CUI_HID_SEARCHATTR
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index a375418..5b3138a 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -177,19 +177,14 @@ class SvxAngleTabPage : public SvxTabPage
using TabPage::DeactivatePage;
private:
-FixedLine aFlPosition;
-FixedText aFtPosX;
-MetricField aMtrPosX;
-FixedText aFtPosY;
-MetricField aMtrPosY;
-FixedText aFtPosPresets;
-SvxRectCtl aCtlRect;
-
-FixedLine aFlAngle;
-FixedText aFtAngle;
-NumericFieldmaNfAngle;
-FixedText aFtAnglePresets;
-svx::DialControlaCtlAngle;
+VclFrame*m_pFlPosition;
+MetricField* m_pMtrPosX;
+MetricField* m_pMtrPosY;
+SvxRectCtl* m_pCtlRect;
+
+VclFrame*m_pFlAngle;
+NumericField*m_pNfAngle;
+svx::DialControl*m_pCtlAngle;
const SfxItemSet rOutAttrs;
const SdrView* pView;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index c83e6c2..6e5bd24 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -26,7 +26,6 @@
#include svx/sderitm.hxx
#include svx/dialogs.hrc
#include cuires.hrc
-#include transfrm.hrc
#include editeng/sizeitem.hxx
#include transfrm.hxx
@@ -208,34 +207,27 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const
Link rLink)
\/
SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet rInAttrs
) :
-SvxTabPage ( pParent, CUI_RES( RID_SVXPAGE_ANGLE ), rInAttrs
),
-aFlPosition ( this, CUI_RES( FL_POSITION ) ),
-aFtPosX ( this, CUI_RES( FT_POS_X ) ),
-aMtrPosX( this, CUI_RES( MTR_FLD_POS_X ) ),
-aFtPosY ( this, CUI_RES( FT_POS_Y ) ),
-aMtrPosY( this, CUI_RES( MTR_FLD_POS_Y ) ),
-aFtPosPresets ( this, CUI_RES(FT_POSPRESETS) ),
-aCtlRect( this, CUI_RES( CTL_RECT ) ),
-
-aFlAngle( this, CUI_RES( FL_ANGLE ) ),
-aFtAngle( this, CUI_RES( FT_ANGLE ) ),
-maNfAngle ( this, CUI_RES( NF_ANGLE ) ),
-aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ),
-aCtlAngle ( this, CUI_RES( CTL_ANGLE ) ),
+SvxTabPage ( pParent
+,Rotation
+,cui/ui/rotationtabpage.ui
+, rInAttrs ),
rOutAttrs ( rInAttrs )
{
-FreeResource();
+get(m_pFlPosition, FL_POSITION);
+get(m_pMtrPosX, MTR_FLD_POS_X);
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4c575c5f0bfbcd7dd0c16e849dfe0428cf4b8b0a Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:08:23 2013 +0100 Updated core Project: help c3a761cddfe4b21a1409096097df3cd8712b0445 diff --git a/helpcontent2 b/helpcontent2 index d2c9834..c3a761c 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d2c983410d61bd286667b89f5d8d44244bb463c0 +Subproject commit c3a761cddfe4b21a1409096097df3cd8712b0445 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/shared/01/05230300.xhp | 24 2 files changed, 12 insertions(+), 18 deletions(-) New commits: commit c3a761cddfe4b21a1409096097df3cd8712b0445 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:08:23 2013 +0100 update help ids for rotation tab page .ui conversion Change-Id: I81e97700542cb48dbbccdf835a3cc0d7d39ddbbe diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8ca2f96..6c9095f 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3803,14 +3803,11 @@ HID_TPCOLOR_RGB_2,33893, HID_TPCOLOR_RGB_3,33894, HID_TPHATCH_CTRL,33991, HID_TPPOSITION_CTRL,33992, -HID_TPROTATION_CTRL1,33994, -HID_TPROTATION_CTRL2,33995, HID_TPSHADOW_CTRL,33990, HID_TPSIZE_CTRL,33993, HID_TP_CUSTOMPROPERTIES,33392, HID_TP_TOX_ENTRY,53240, HID_TP_TOX_SELECT,53239, -HID_TRANS_ANGLE,33780, HID_TXTFOOTER,41145, HID_TXTSENDERCITY,41141, HID_TXTSENDERFAX,41142, @@ -7087,9 +7084,6 @@ svx_MetricField_RID_SVXFLOAT_3D_MTR_MAT_SPECULAR_INTENSITY,3388496506, svx_MetricField_RID_SVXFLOAT_3D_MTR_PERCENT_DIAGONAL,3388496414, svx_MetricField_RID_SVXFLOAT_3D_MTR_SLANT,3388496433, svx_MetricField_RID_SVXPAGE_ALIGNMENT_ED_INDENT,702192142, -svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_ANGLE,701504019, -svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_POS_X,701504007, -svx_MetricField_RID_SVXPAGE_ANGLE_MTR_FLD_POS_Y,701504008, svx_MetricField_RID_SVXPAGE_BACKGROUND_MF_COL_TRANS,700733988, svx_MetricField_RID_SVXPAGE_BACKGROUND_MF_GRAPH_TRANS,700733990, svx_MetricField_RID_SVXPAGE_BORDER_ED_SHADOWSIZE,700799522, diff --git a/source/text/shared/01/05230300.xhp b/source/text/shared/01/05230300.xhp index e191da3..96d7e17 100644 --- a/source/text/shared/01/05230300.xhp +++ b/source/text/shared/01/05230300.xhp @@ -31,9 +31,9 @@ /meta body section id=drehung -bookmark xml-lang=en-US branch=hid/CUI_HID_TRANS_ANGLE id=bm_id3156045 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/rotationtabpage/Rotation id=bm_id3156045 localize=false/ paragraph role=heading id=hd_id3149741 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/01/05230300.xhp name=RotationRotation/link/paragraph -paragraph role=paragraph id=par_id3146873 xml-lang=en-US l10n=U oldref=2ahelp hid=HID_TRANS_ANGLERotates the selected object./ahelp/paragraph +paragraph role=paragraph id=par_id3146873 xml-lang=en-US l10n=U oldref=2ahelp hid=cui/ui/rotationtabpage/RotationRotates the selected object./ahelp/paragraph /section section id=howtoget embed href=text/shared/00/00040502.xhp#drehung/ @@ -42,22 +42,22 @@ paragraph role=paragraph id=par_id3150902 xml-lang=en-US l10n=U oldref=4The selected object is rotated around a pivot point that you specify. The default pivot point is at the center of the object./paragraph paragraph role=note id=par_id3153528 xml-lang=en-US l10n=U oldref=17If you set a pivot point too far outside of the object boundaries, the object could be rotated off of the page./paragraph -bookmark xml-lang=en-US branch=hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X id=bm_id3109848 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/rotationtabpage/MTR_FLD_POS_X id=bm_id3109848 localize=false/ paragraph role=heading id=hd_id3145382 xml-lang=en-US level=3 l10n=U oldref=5X Position/paragraph -paragraph role=paragraph id=par_id3166410 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_XEnter the horizontal distance from the left edge of the page to the pivot point./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y id=bm_id3159158 localize=false/ +paragraph role=paragraph id=par_id3166410 xml-lang=en-US l10n=U oldref=6ahelp hid=cui/ui/rotationtabpage/MTR_FLD_POS_XEnter the horizontal distance from the left edge of the page to the pivot point./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/rotationtabpage/MTR_FLD_POS_Y id=bm_id3159158 localize=false/ paragraph role=heading id=hd_id3155323 xml-lang=en-US level=3 l10n=U oldref=7Y Position/paragraph -paragraph role=paragraph id=par_id3150669 xml-lang=en-US l10n=U oldref=8ahelp hid=SVX:METRICFIELD:RID_SVXPAGE_ANGLE:MTR_FLD_POS_YEnter the vertical distance from the top edge of the page to the pivot point./ahelp/paragraph -bookmark xml-lang=en-US branch=hid/CUI_HID_TPROTATION_CTRL1 id=bm_id3148491 localize=false/ +paragraph role=paragraph id=par_id3150669 xml-lang=en-US l10n=U oldref=8ahelp hid=cui/ui/rotationtabpage/MTR_FLD_POS_YEnter the vertical distance from the top edge of the page to the pivot point./ahelp/paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/rotationtabpage/CTL_RECT id=bm_id3148491 localize=false/ paragraph role=heading id=hd_id3153332 xml-lang=en-US level=2 l10n=U oldref=9Defaults/paragraph -paragraph role=paragraph id=par_id3143270 xml-lang=en-US l10n=U oldref=10ahelp hid=HID_TPROTATION_CTRL1Click where
[Libreoffice-commits] core.git: sc/source sc/uiconfig
sc/source/ui/dbgui/validate.cxx |4 sc/uiconfig/scalc/ui/erroralerttabpage.ui |6 +- 2 files changed, 5 insertions(+), 5 deletions(-) New commits: commit fc2ca4e8404122aa7d893f6b3d169345fb95a673 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:21:19 2013 +0100 set some default widths/heights for validate multiline edit boxes Change-Id: Ide59f0fa382c148abeac2b3dde17cc913183391d diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 07c3c19..45e3694 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -692,6 +692,8 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent, get(pTsbHelp,tsbhelp); get(pEdtTitle,title); get(pEdInputHelp,inputhelp); +pEdInputHelp-set_height_request(pEdInputHelp-GetTextHeight() * 12); +pEdInputHelp-set_width_request(pEdInputHelp-approximate_char_width() * 50); Init(); } @@ -773,6 +775,8 @@ ScTPValidationError::ScTPValidationError( Window* pParent, get(m_pEdtTitle,title); get(m_pFtError,errormsg_label); get(m_pEdError,errorMsg); +m_pEdError-set_height_request(m_pEdError-GetTextHeight() * 12); +m_pEdError-set_width_request(m_pEdError-approximate_char_width() * 50); Init(); } diff --git a/sc/uiconfig/scalc/ui/erroralerttabpage.ui b/sc/uiconfig/scalc/ui/erroralerttabpage.ui index ec11e31..40a20be 100644 --- a/sc/uiconfig/scalc/ui/erroralerttabpage.ui +++ b/sc/uiconfig/scalc/ui/erroralerttabpage.ui @@ -16,7 +16,6 @@ property name=can_focusTrue/property property name=receives_defaultFalse/property property name=hexpandTrue/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=inconsistentTrue/property @@ -89,7 +88,6 @@ object class=GtkScrolledWindow id=scrolledwindow1 property name=visibleTrue/property property name=can_focusTrue/property -property name=hexpandTrue/property property name=vexpandTrue/property property name=vscrollbar_policyalways/property property name=shadow_typein/property @@ -97,7 +95,6 @@ object class=GtkTextView id=errorMsg:border property name=visibleTrue/property property name=can_focusTrue/property -property name=hexpandTrue/property property name=vexpandTrue/property /object /child @@ -113,7 +110,6 @@ object class=GtkEntry id=title property name=visibleTrue/property property name=can_focusTrue/property -property name=hexpandTrue/property property name=invisible_charâ/property property name=invisible_char_setTrue/property /object @@ -147,7 +143,6 @@ property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property /object packing @@ -161,6 +156,7 @@ object class=GtkComboBoxText id=actionCB property name=visibleTrue/property property name=can_focusFalse/property +property name=hexpandTrue/property items item translatable=yesStop/item item translatable=yesWarning/item ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source sc/uiconfig sc/UIConfig_scalc.mk
sc/UIConfig_scalc.mk |1
sc/source/ui/dbgui/validate.cxx | 62 -
sc/source/ui/dbgui/validate.src | 84
sc/source/ui/inc/validate.hrc | 12 -
sc/source/ui/inc/validate.hxx | 15 --
sc/uiconfig/scalc/ui/erroralerttabpage.ui | 200 ++
6 files changed, 236 insertions(+), 138 deletions(-)
New commits:
commit d0c166ad33042403c5ecf9367c3362542cb3549a
Author: Manal Alhassoun malhass...@kacst.edu.sa
Date: Mon Aug 19 10:01:25 2013 +0300
erroralerttabpage.ui widgets
Change-Id: Ia0a11f636b864e5dd7c8ef6f4e8d1c3bb6f0a26f
Reviewed-on: https://gerrit.libreoffice.org/5507
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 7776682..9274dd6 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/deletecells \
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/descriptivestatisticsdialog \
+ sc/uiconfig/scalc/ui/erroralerttabpage \
sc/uiconfig/scalc/ui/externaldata \
sc/uiconfig/scalc/ui/filldlg \
sc/uiconfig/scalc/ui/footerdialog \
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 83419ae..07c3c19 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -764,20 +764,16 @@ ScTPValidationError::ScTPValidationError( Window*
pParent,
const SfxItemSet rArgSet )
: SfxTabPage ( pParent,
- ScResId( TP_VALIDATION_ERROR ),
- rArgSet ),
-aTsbShow( this, ScResId( TSB_SHOW ) ),
-aFlContent ( this, ScResId( FL_CONTENT ) ),
-aFtAction ( this, ScResId( FT_ACTION ) ),
-aLbAction ( this, ScResId( LB_ACTION ) ),
-aBtnSearch ( this, ScResId( BTN_SEARCH ) ),
-aFtTitle( this, ScResId( FT_TITLE ) ),
-aEdtTitle ( this, ScResId( EDT_TITLE ) ),
-aFtError( this, ScResId( FT_ERROR ) ),
-aEdError( this, ScResId( EDT_ERROR ) )
+ ErrorAlertTabPage ,
modules/scalc/ui/erroralerttabpage.ui ,
+ rArgSet )
{
+get(m_pTsbShow,tsbshow);
+get(m_pLbAction,actionCB);
+get(m_pBtnSearch,browseBtn);
+get(m_pEdtTitle,title);
+get(m_pFtError,errormsg_label);
+get(m_pEdError,errorMsg);
Init();
-FreeResource();
}
// ---
@@ -790,11 +786,11 @@ ScTPValidationError::~ScTPValidationError()
void ScTPValidationError::Init()
{
-aLbAction.SetSelectHdl( LINK( this, ScTPValidationError, SelectActionHdl )
);
-aBtnSearch.SetClickHdl( LINK( this, ScTPValidationError, ClickSearchHdl )
);
+m_pLbAction-SetSelectHdl( LINK( this, ScTPValidationError,
SelectActionHdl ) );
+m_pBtnSearch-SetClickHdl( LINK( this, ScTPValidationError, ClickSearchHdl
) );
-aLbAction.SelectEntryPos( 0 );
-aTsbShow.EnableTriState( false );
+m_pLbAction-SelectEntryPos( 0 );
+m_pTsbShow-EnableTriState( false );
SelectActionHdl( NULL );
}
@@ -821,24 +817,24 @@ void ScTPValidationError::Reset( const SfxItemSet
rArgSet )
const SfxPoolItem* pItem;
if ( rArgSet.GetItemState( FID_VALID_SHOWERR, sal_True, pItem ) ==
SFX_ITEM_SET )
-aTsbShow.SetState( ((const SfxBoolItem*)pItem)-GetValue() ?
STATE_CHECK : STATE_NOCHECK );
+m_pTsbShow-SetState( ((const SfxBoolItem*)pItem)-GetValue() ?
STATE_CHECK : STATE_NOCHECK );
else
-aTsbShow.SetState( STATE_CHECK ); // check by default
+m_pTsbShow-SetState( STATE_CHECK ); // check by default
if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, sal_True, pItem ) ==
SFX_ITEM_SET )
-aLbAction.SelectEntryPos( ((const SfxAllEnumItem*)pItem)-GetValue() );
+m_pLbAction-SelectEntryPos( ((const
SfxAllEnumItem*)pItem)-GetValue() );
else
-aLbAction.SelectEntryPos( 0 );
+m_pLbAction-SelectEntryPos( 0 );
if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, sal_True, pItem ) ==
SFX_ITEM_SET )
-aEdtTitle.SetText( ((const SfxStringItem*)pItem)-GetValue() );
+m_pEdtTitle-SetText( ((const SfxStringItem*)pItem)-GetValue() );
else
-aEdtTitle.SetText( EMPTY_STRING );
+m_pEdtTitle-SetText( EMPTY_STRING );
if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, sal_True, pItem ) ==
SFX_ITEM_SET )
-aEdError.SetText( ((const SfxStringItem*)pItem)-GetValue() );
+m_pEdError-SetText( ((const SfxStringItem*)pItem)-GetValue() );
else
-aEdError.SetText( EMPTY_STRING );
+m_pEdError-SetText( EMPTY_STRING );
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |6 -- source/text/scalc/01/12120300.xhp | 22 +++--- 2 files changed, 11 insertions(+), 17 deletions(-) New commits: commit 79e86ab4719ffe4d9178a5a97c0f69835cf2e9e3 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:25:59 2013 +0100 update help ids for error alert tab page .ui conversion Change-Id: I82821a23831988cff18b6eb907e61da6eb6e5263 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 6c9095f..9968aab 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6287,7 +6287,6 @@ sc_Edit_RID_SCDLG_TABOP_ED_COLCELL,2567899139, sc_Edit_RID_SCDLG_TABOP_ED_FORMULARANGE,2567899137, sc_Edit_RID_SCDLG_TABOP_ED_ROWCELL,2567899138, sc_Edit_RID_SCPAGE_CALC_ED_EPS,957253637, -sc_Edit_TP_VALIDATION_ERROR_EDT_TITLE,548309005, sc_Edit_TP_VALIDATION_VALUES_EDT_MAX,548276233, sc_Edit_TP_VALIDATION_VALUES_EDT_MIN,548276231, sc_FloatingWindow_RID_SCDLG_TEAM,231304704, @@ -6348,7 +6347,6 @@ sc_ListBox_RID_SCDLG_PIVOT_LAYOUT_LB_OUTAREA,2567507478, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973, sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974, -sc_ListBox_TP_VALIDATION_ERROR_LB_ACTION,548310552, sc_ListBox_TP_VALIDATION_VALUES_LB_ALLOW,548277762, sc_ListBox_TP_VALIDATION_VALUES_LB_VALUE,548277765, sc_MetricField_RID_SCDLG_COL_MAN_ED_VALUE,1494915585, @@ -6368,7 +6366,6 @@ sc_MoreButton_RID_SCDLG_DPDATAFIELD_BTN_MORE,1495396868, sc_MoreButton_RID_SCDLG_PIVOTFILTER_BTN_MORE,1493758465, sc_MoreButton_RID_SCDLG_PIVOT_LAYOUT_BTN_MORE,2567516676, sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541, -sc_MultiLineEdit_TP_VALIDATION_ERROR_EDT_ERROR,548309529, sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765, sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137, sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657, @@ -6394,7 +6391,6 @@ sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET1,1495667315, sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET2,1495667318, sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET3,1495667321, sc_PushButton_RID_SCDLG_RETYPEPASS_BTN_RETYPE_SHEET4,1495667324, -sc_PushButton_TP_VALIDATION_ERROR_BTN_SEARCH,548311578, sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_COLS,1494368769, sc_RadioButton_RID_SCDLG_COLORROW_BTN_GROUP_ROWS,1494368771, sc_RadioButton_RID_SCDLG_DPDATEGROUP_RB_AUTOEND,1495433731, @@ -6433,13 +6429,11 @@ sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP1,956432903, sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP2,956432904, sc_RadioButton_RID_SCPAGE_SORT_FIELDS_BTN_UP3,956432905, sc_TabPage_RID_SCPAGE_STAT,957628416, -sc_TabPage_TP_VALIDATION_ERROR,548306944, sc_TabPage_TP_VALIDATION_VALUES,548274176, sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_HIDE_ALL,956384771, sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_HIDE_FORMULAR,956384770, sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_HIDE_PRINT,956384774, sc_TriStateBox_RID_SCPAGE_PROTECTION_BTN_PROTECTED,956384769, -sc_TriStateBox_TP_VALIDATION_ERROR_TSB_SHOW,548308501, sd_CheckBox_DLG_ASS_CB_PAGE3_LOGO,1088488501, sd_CheckBox_DLG_ASS_CB_PAGE5_SUMMARY,1088488511, sd_CheckBox_DLG_ASS_CB_PREVIEW,1088488455, diff --git a/source/text/scalc/01/12120300.xhp b/source/text/scalc/01/12120300.xhp index 565cf42..4de6518 100644 --- a/source/text/scalc/01/12120300.xhp +++ b/source/text/scalc/01/12120300.xhp @@ -32,31 +32,31 @@ /meta body section id=fehlermeldung -bookmark xml-lang=en-US branch=hid/sc:TabPage:TP_VALIDATION_ERROR id=bm_id3156024 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/erroralerttabpage/ErrorAlertTabPage id=bm_id3156024 localize=false/ paragraph role=heading id=hd_id3153821 xml-lang=en-US level=1 l10n=U oldref=1link href=text/scalc/01/12120300.xhp name=Error AlertError Alert/link/paragraph -paragraph role=paragraph id=par_id3153379 xml-lang=en-US l10n=U oldref=2ahelp hid=SC:TABPAGE:TP_VALIDATION_ERRORDefine the error message that is displayed when invalid data is entered in a cell./ahelp/paragraph +paragraph role=paragraph id=par_id3153379 xml-lang=en-US l10n=U oldref=2ahelp hid=modules/scalc/ui/erroralerttabpage/ErrorAlertTabPageDefine the error message that is displayed when invalid data is entered in a cell./ahelp/paragraph /section paragraph role=paragraph id=par_id3154138 xml-lang=en-US l10n=U oldref=25You can also start a macro with an error message. A sample macro is provided at the end of this page./paragraph section id=howtoget embed href=text/scalc/00/0412.xhp#datengueltigfehler/ /section -bookmark xml-lang=en-US branch=hid/sc:TriStateBox:TP_VALIDATION_ERROR:TSB_SHOW id=bm_id3154908 localize=false/ +bookmark xml-lang=en-US branch=hid/modules/scalc/ui/erroralerttabpage/tsbshow id=bm_id3154908 localize=false/ paragraph role=heading id=hd_id3156280 xml-lang=en-US level=2 l10n=U oldref=3Show error message when invalid values are entered./paragraph paragraph
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 082cff5eec3edf1a96fefb27f760326a495557b8 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:25:59 2013 +0100 Updated core Project: help 79e86ab4719ffe4d9178a5a97c0f69835cf2e9e3 diff --git a/helpcontent2 b/helpcontent2 index c3a761c..79e86ab 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit c3a761cddfe4b21a1409096097df3cd8712b0445 +Subproject commit 79e86ab4719ffe4d9178a5a97c0f69835cf2e9e3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSOC] Code completion in Basic IDE - weekly report
Hi all, this is my weekly report. UI: Menu and ModalDialog was replaced by a tab in Tools/Options, and it's called Basic IDE Option. ListBox: left arrow dismisses the dialog when the cursor goes beyond the dot, right arrow dismissed when cursor reaches the next line. Function Autocorrect Keywords was renamed to Autocorrection, because it autocorrects not just keywords but the UNO variables also (now, I'm working on to autocomplete procedures, other types, like String, Boolean, etc. ). Autoclose procedures: cursor is places inside the completed sub/function. Code: CodeCompleteWindow::ResizeListBox: Function was simplified, I've introduced some constants, and the position+size calculation is completely done by this( the initial text selection is passed in as a parameter). Variables according to autocorrection were renamed to keep the consistence. Regards, Gergő ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: crach in writer
Hi, I have already reverted it with 835d9e0da9416c7e586766ad734f45d048886e0ahttp://cgit.freedesktop.org/libreoffice/core/commit/?id=835d9e0da9416c7e586766ad734f45d048886e0a . So if you update your master, then the crash will hopefully vanish. Best regards, Tamás 2013/8/19 Abdulaziz Ayed Khalid Alayed aala...@kacst.edu.sa Hi your patch with commit-id(0d9ddccd8810a81a6f4d737870969d0dcf367d23) making crach in writer when you write a RTL string followed by numbers(at least 2). so, can you fix this problem . Warm Regards, Abdulaziz Ayed Alayed developer at Motah Program , KACST http://www.motah.org.sa *Warning: *This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. *تحذير:* هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار الناتجة عن ما قد يحتويه هذا البريد. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Performance Issue on Loading Expert Config (a.k.a About Config Utility)
Efe Gürkan YALAMAN wrote: Did some profiling with a few more toplevels given: -Page load is too slow because of CuiAboutConfigTabPage::FillItems.[2] -Figured out ListBox is the main cause of the issue. -Thorsten sent a patch about this issue to me. It was putting toggles for setting update mode.[3] -I put it outside of the method on local. It improved performance. Reduced the wait time from ~20mins to ~15sec with / as an only toplevel. Hi Efe, hmm, so I think most of the work in FillItems seems redundant, I wonder if there is another listbox subclass that is better suited for this kind of usage (Caolan, in Cc, might know). Failing that, let's look into dynamically updating the content (either stick 100 items into the listbox, then reschedule, or make use of this SvListView concept - FWICT, that should allow you to show items from your own internal container on demand). HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
a lot of warnings when running calc
Hi Kohei, I'm experiencing a lot of warn:legacy.osl:4464:1:sc/source/core/data/documen7.cxx:275: RemoveFromFormulaTree: nFormulaCodeInTree nRPN when running calc from the command line (built without my code changes). As the file (sc/source/core/data/documen7.cxx) has only been changed by you in the last couple of months, I guess you know a lot about the code there ;) Is this a 'harmless' warning? If so, could it be an idea to remove it? If not, can I do something about it (i.e. solve the problem)? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/inc/helpid.hrc |1 - cui/uiconfig/ui/similaritysearchdialog.ui | 14 ++ 2 files changed, 2 insertions(+), 13 deletions(-) New commits: commit fc9984e230058c28a9eeebf473119c9479753317 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:37:57 2013 +0100 missing mnemonic widget Change-Id: I292db7ad4c614568fe9a5f011e545e9a068e8a5c diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index e3d268c..8354935 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -212,7 +212,6 @@ #define HID_TPHATCH_CTRL CUI_HID_TPHATCH_CTRL #define HID_SEARCHATTR_CTL_ATTR CUI_HID_SEARCHATTR_CTL_ATTR #define HID_SEARCHATTR CUI_HID_SEARCHATTR -#define HID_SEARCHSIMILARITY CUI_HID_SEARCHSIMILARITY #define UID_SEARCH_RECORDSTATUS CUI_UID_SEARCH_RECORDSTATUS #define HID_TPCOLOR_RGB_1 CUI_HID_TPCOLOR_RGB_1 #define HID_TPCOLOR_RGB_2 CUI_HID_TPCOLOR_RGB_2 diff --git a/cui/uiconfig/ui/similaritysearchdialog.ui b/cui/uiconfig/ui/similaritysearchdialog.ui index e1e4a7d..8be5071 100644 --- a/cui/uiconfig/ui/similaritysearchdialog.ui +++ b/cui/uiconfig/ui/similaritysearchdialog.ui @@ -24,13 +24,11 @@ child object class=GtkButton id=ok property name=labelgtk-ok/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=can_defaultTrue/property property name=has_defaultTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property property name=use_stockTrue/property /object packing @@ -42,11 +40,9 @@ child object class=GtkButton id=cancel property name=labelgtk-cancel/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property property name=use_stockTrue/property /object packing @@ -58,11 +54,9 @@ child object class=GtkButton id=help property name=labelgtk-help/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property property name=use_stockTrue/property property name=image_positiontop/property /object @@ -143,6 +137,7 @@ property name=xalign0/property property name=label translatable=yes_Remove characters/property property name=use_underlineTrue/property +property name=mnemonic_widgetshorterfld/property /object packing property name=left_attach0/property @@ -154,11 +149,9 @@ child object class=GtkCheckButton id=relaxbox property name=label translatable=yes_Combine/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=xalign0/property property name=draw_indicatorTrue/property @@ -166,7 +159,7 @@ packing property name=left_attach0/property property name=top_attach3/property -property name=width1/property +property name=width2/property property name=height1/property /packing /child @@ -215,9 +208,6 @@ property name=height1/property /packing /child -child - placeholder/ -/child /object packing property name=expandFalse/property
[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk
cui/UIConfig_cui.mk |1
cui/source/dialogs/srchxtra.cxx | 31 +--
cui/source/dialogs/srchxtra.hrc |9 -
cui/source/dialogs/srchxtra.src | 108
cui/source/inc/cuires.hrc |3
cui/source/inc/srchxtra.hxx | 24 --
cui/uiconfig/ui/similaritysearchdialog.ui | 257 ++
7 files changed, 276 insertions(+), 157 deletions(-)
New commits:
commit 68e793d36dbdcae8d9eb77ef0b37c9daba49075d
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Aug 19 13:26:52 2013 +0300
Convert similarity search dialog to .ui
Conflicts:
cui/UIConfig_cui.mk
Change-Id: Ia628babd27ca29769a6a287f70367d8208c5cc59
Reviewed-on: https://gerrit.libreoffice.org/5510
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4e52967..9435977 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/securityoptionsdialog \
cui/uiconfig/ui/select_persona_dialog \
cui/uiconfig/ui/shadowtabpage \
+ cui/uiconfig/ui/similaritysearchdialog \
cui/uiconfig/ui/slantcornertabpage \
cui/uiconfig/ui/specialcharacters \
cui/uiconfig/ui/spellingdialog \
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 4a6f443..bbe94bc 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -248,28 +248,17 @@ SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
sal_uInt16 nShorter,
sal_uInt16 nLonger
) :
-ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
-
-aFixedLine ( this, CUI_RES( FL_SIMILARITY ) ),
-aOtherTxt ( this, CUI_RES( FT_OTHER ) ),
-aOtherFld ( this, CUI_RES( NF_OTHER ) ),
-aLongerTxt ( this, CUI_RES( FT_LONGER ) ),
-aLongerFld ( this, CUI_RES( NF_LONGER ) ),
-aShorterTxt ( this, CUI_RES( FT_SHORTER ) ),
-aShorterFld ( this, CUI_RES( NF_SHORTER ) ),
-aRelaxBox ( this, CUI_RES( CB_RELAX ) ),
-
-aOKBtn ( this, CUI_RES( BTN_ATTR_OK ) ),
-aEscBtn ( this, CUI_RES( BTN_ATTR_CANCEL ) ),
-aHelpBtn( this, CUI_RES( BTN_ATTR_HELP ) )
-
+ModalDialog( pParent, SimilaritySearchDialog,
cui/ui/similaritysearchdialog.ui )
{
-FreeResource();
-
-aOtherFld.SetValue( nOther );
-aShorterFld.SetValue( nShorter );
-aLongerFld.SetValue( nLonger );
-aRelaxBox.Check( bRelax );
+get( m_pOtherFld, otherfld);
+get( m_pLongerFld, longerfld);
+get( m_pShorterFld, shorterfld);
+get( m_pRelaxBox, relaxbox);
+
+m_pOtherFld-SetValue( nOther );
+m_pShorterFld-SetValue( nShorter );
+m_pLongerFld-SetValue( nLonger );
+m_pRelaxBox-Check( bRelax );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/srchxtra.hrc b/cui/source/dialogs/srchxtra.hrc
index ced02f3..6bfe114 100644
--- a/cui/source/dialogs/srchxtra.hrc
+++ b/cui/source/dialogs/srchxtra.hrc
@@ -27,15 +27,6 @@
#define LB_ATTR 13
#define FL_ATTR 14
-#define CB_RELAX15
-#define FT_OTHER16
-#define NF_OTHER17
-#define FT_SHORTER 18
-#define NF_SHORTER 19
-#define FT_LONGER 20
-#define NF_LONGER 21
-#define FL_SIMILARITY 22
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/srchxtra.src b/cui/source/dialogs/srchxtra.src
index 9c10335..ec032f7 100644
--- a/cui/source/dialogs/srchxtra.src
+++ b/cui/source/dialogs/srchxtra.src
@@ -123,114 +123,6 @@ ModalDialog RID_SVXDLG_SEARCHATTR
Size = MAP_APPFONT ( 50 , 14 ) ;
};
};
- // RID_SVXDLG_SEARCHSIMILARITY ---
-ModalDialog RID_SVXDLG_SEARCHSIMILARITY
-{
-HelpId = HID_SEARCHSIMILARITY ;
-OutputSize = TRUE ;
-SVLook = TRUE ;
-Size = MAP_APPFONT ( 178 , 76 ) ;
-Text [ en-US ] = Similarity Search ;
-Moveable = TRUE ;
-FixedText FT_OTHER
-{
-Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 70 , 8 ) ;
-Text [ en-US ] = ~Exchange characters ;
-};
-NumericField NF_OTHER
-{
-HelpID = cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER;
-Pos = MAP_APPFONT ( 86 , 14 ) ;
-Size = MAP_APPFONT ( 24 , 12 ) ;
-Border = TRUE ;
-Left = TRUE ;
-Repeat = TRUE ;
-Spin = TRUE ;
-Minimum = 0 ;
-First = 1 ;
-Maximum = 30 ;
-Last = 30 ;
-Value = 1 ;
-TabStop = TRUE ;
-};
-FixedText FT_LONGER
-{
-Pos = MAP_APPFONT ( 12 , 30 ) ;
-Size = MAP_APPFONT ( 70 , 8 ) ;
-Text [ en-US ] = ~Add characters ;
-};
-NumericField NF_LONGER
-{
-
[Libreoffice-commits] core.git: cui/source
cui/source/inc/helpid.hrc |2 ++ 1 file changed, 2 insertions(+) New commits: commit fe9124ffee515087a591d51316caf29bcfc4de4a Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:45:12 2013 +0100 Revert drop unused help ids blast, they *are* unused, bad grep This reverts commit 0ec56aee18cf35728596a0398b0aaf3384099a17. Change-Id: I06b618f88240dab084dfa89fd21119f07d5ee5d5 diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 5af383e..8354935 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -189,6 +189,8 @@ #define HID_SEARCH_STARTOVER CUI_HID_SEARCH_STARTOVER #define HID_SEARCH_WILDCARD CUI_HID_SEARCH_WILDCARD #define HID_SEARCH_REGULAR CUI_HID_SEARCH_REGULAR +#define HID_SEARCH_APPROX CUI_HID_SEARCH_APPROX +#define HID_SEARCH_APPROXSETTINGS CUI_HID_SEARCH_APPROXSETTINGS #define HID_SEARCH_BTN_SEARCH CUI_HID_SEARCH_BTN_SEARCH #define HID_SEARCH_BTN_CLOSE CUI_HID_SEARCH_BTN_CLOSE #define HID_GALLERY_BROWSER CUI_HID_GALLERY_BROWSER ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source helpcontent2
cui/source/inc/helpid.hrc |2 -- helpcontent2 |2 +- 2 files changed, 1 insertion(+), 3 deletions(-) New commits: commit 0ec56aee18cf35728596a0398b0aaf3384099a17 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:41:43 2013 +0100 drop unused help ids Change-Id: I780f4a117ce0a461031d8b66747d7d52493ef6d2 diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 8354935..5af383e 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -189,8 +189,6 @@ #define HID_SEARCH_STARTOVER CUI_HID_SEARCH_STARTOVER #define HID_SEARCH_WILDCARD CUI_HID_SEARCH_WILDCARD #define HID_SEARCH_REGULAR CUI_HID_SEARCH_REGULAR -#define HID_SEARCH_APPROX CUI_HID_SEARCH_APPROX -#define HID_SEARCH_APPROXSETTINGS CUI_HID_SEARCH_APPROXSETTINGS #define HID_SEARCH_BTN_SEARCH CUI_HID_SEARCH_BTN_SEARCH #define HID_SEARCH_BTN_CLOSE CUI_HID_SEARCH_BTN_CLOSE #define HID_GALLERY_BROWSER CUI_HID_GALLERY_BROWSER commit fa6550d45e6c7f315ee55b7392dff9a512fd0d08 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:42:29 2013 +0100 Updated core Project: help 339d9e2a57394896e9a199d2c2676d4e97d31ba1 diff --git a/helpcontent2 b/helpcontent2 index 79e86ab..339d9e2 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 79e86ab4719ffe4d9178a5a97c0f69835cf2e9e3 +Subproject commit 339d9e2a57394896e9a199d2c2676d4e97d31ba1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |7 --- source/text/shared/01/02100100.xhp | 19 +-- 2 files changed, 9 insertions(+), 17 deletions(-) New commits: commit 339d9e2a57394896e9a199d2c2676d4e97d31ba1 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:42:29 2013 +0100 update help ids for Similarity Search Dialog .ui conversion Change-Id: I8e0812fe94f5a97e48213c3b48280d912b9e97e6 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 9968aab..0598e47 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -3388,10 +3388,7 @@ HID_SD_WIN_PRESENTATION,59836, HID_SEARCHATTR,33820, HID_SEARCHATTR_CTL_ATTR,33883, HID_SEARCHDIALOG,33379, -HID_SEARCHSIMILARITY,33823, HID_SEARCH_ALLFIELDS,38179, -HID_SEARCH_APPROX,38189, -HID_SEARCH_APPROXSETTINGS,38190, HID_SEARCH_BACKWARD,38185, HID_SEARCH_BTN_CLOSE,38192, HID_SEARCH_BTN_SEARCH,38191, @@ -6777,7 +6774,6 @@ svx_CheckBox_RID_SVXDLG_OPT_JAVASCRIPT_DISABLE_CB_JSCPT_DISABLE,1241269470, svx_CheckBox_RID_SVXDLG_RUBY_CB_AUTO_DETECT,2315371521, svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_HALFFULLFORMS,1368769544, svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK,1368769545, -svx_CheckBox_RID_SVXDLG_SEARCHSIMILARITY_CB_RELAX,1237959695, svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014, svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795, svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782, @@ -7175,9 +7171,6 @@ svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881, svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880, svx_NumericField_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT,809211913, svx_NumericField_RID_SVXDLG_LNG_ED_NUM_PREBREAK_ED_PREBREAK,1251186996, -svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_LONGER,1237964821, -svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHER,1237964817, -svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_SHORTER,1237964819, svx_NumericField_RID_SVXFLOAT_3D_NUM_HORIZONTAL,3388495897, svx_NumericField_RID_SVXFLOAT_3D_NUM_VERTICAL,3388495899, svx_NumericField_RID_SVXPAGE_ALIGNMENT_NF_DEGREES,702191640, diff --git a/source/text/shared/01/02100100.xhp b/source/text/shared/01/02100100.xhp index 8793915..dbf83df 100644 --- a/source/text/shared/01/02100100.xhp +++ b/source/text/shared/01/02100100.xhp @@ -32,8 +32,7 @@ bookmark_valuefinding; similarity search/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/svx/ui/findreplacedialog/similarity id=bm_id3148410 localize=false/ -bookmark xml-lang=en-US branch=hid/CUI_HID_SEARCH_APPROX id=bm_id3154814 localize=false/ -bookmark xml-lang=en-US branch=hid/CUI_HID_SEARCH_APPROXSETTINGS id=bm_id3154817 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/similaritysearchdialog/SimilaritySearchDialog id=bm_id3154814 localize=false/ paragraph role=heading id=hd_id3156045 xml-lang=en-US level=1 l10n=U oldref=52link href=text/shared/01/02100100.xhp name=Similarity SearchSimilarity Search/link/paragraph paragraph role=paragraph id=par_id3146856 xml-lang=en-US l10n=U oldref=53ahelp hid=svx/ui/findreplacedialog/similarityFind terms that are similar to the emphSearch for /emphtext. Select this checkbox, and then click the emph.../emph button to define the similarity options./ahelp/paragraph /section @@ -46,17 +45,17 @@ paragraph role=paragraph id=par_id3145629 xml-lang=en-US l10n=U oldref=55ahelp hid=svx/ui/findreplacedialog/similaritybtnSet the options for the similarity search./ahelp/paragraph paragraph role=heading id=hd_id3149511 xml-lang=en-US level=2 l10n=U oldref=56Settings/paragraph paragraph role=paragraph id=par_id3152594 xml-lang=en-US l10n=U oldref=57Define the criteria for determining if a word is similar to the search term./paragraph -bookmark xml-lang=en-US branch=hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER id=bm_id3155338 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/similaritysearchdialog/otherfld id=bm_id3155338 localize=false/ paragraph role=heading id=hd_id3153551 xml-lang=en-US level=3 l10n=U oldref=58Exchange characters/paragraph -paragraph role=paragraph id=par_id3152551 xml-lang=en-US l10n=U oldref=59ahelp hid=SVX_NUMERICFIELD_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHEREnter the number of characters in the search term that can be exchanged./ahelp For example, if you specify 2 exchanged characters, black and crack are considered similar./paragraph -bookmark xml-lang=en-US branch=hid/cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER id=bm_id3150443 localize=false/ +paragraph role=paragraph id=par_id3152551 xml-lang=en-US l10n=U oldref=59ahelp hid=cui/ui/similaritysearchdialog/otherfldEnter the number of characters in the search term that can be exchanged./ahelp For example, if you specify 2 exchanged characters, black and crack are considered similar./paragraph +bookmark xml-lang=en-US branch=hid/cui/ui/similaritysearchdialog/longerfld id=bm_id3150443
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 876ae5ed8401e66c46252e10a2c21988246d547a Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:47:05 2013 +0100 Updated core Project: help 50fb4825f0debbcff34a6110e66caaae2674fba5 diff --git a/helpcontent2 b/helpcontent2 index 339d9e2..50fb482 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 339d9e2a57394896e9a199d2c2676d4e97d31ba1 +Subproject commit 50fb4825f0debbcff34a6110e66caaae2674fba5 ___ 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/01/02100100.xhp |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 50fb4825f0debbcff34a6110e66caaae2674fba5 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 12:47:05 2013 +0100 restore search form ids Change-Id: I84b7bd0d6e7e250cdb4eb7f4590458ef6cc10044 diff --git a/source/text/shared/01/02100100.xhp b/source/text/shared/01/02100100.xhp index dbf83df..e1fcc02 100644 --- a/source/text/shared/01/02100100.xhp +++ b/source/text/shared/01/02100100.xhp @@ -32,7 +32,9 @@ bookmark_valuefinding; similarity search/bookmark_value /bookmark bookmark xml-lang=en-US branch=hid/svx/ui/findreplacedialog/similarity id=bm_id3148410 localize=false/ -bookmark xml-lang=en-US branch=hid/cui/ui/similaritysearchdialog/SimilaritySearchDialog id=bm_id3154814 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/similaritysearchdialog/SimilaritySearchDialog id=bm_id3154815 localize=false/ +bookmark xml-lang=en-US branch=hid/CUI_HID_SEARCH_APPROX id=bm_id3154814 localize=false/ +bookmark xml-lang=en-US branch=hid/CUI_HID_SEARCH_APPROXSETTINGS id=bm_id3154817 localize=false/ paragraph role=heading id=hd_id3156045 xml-lang=en-US level=1 l10n=U oldref=52link href=text/shared/01/02100100.xhp name=Similarity SearchSimilarity Search/link/paragraph paragraph role=paragraph id=par_id3146856 xml-lang=en-US l10n=U oldref=53ahelp hid=svx/ui/findreplacedialog/similarityFind terms that are similar to the emphSearch for /emphtext. Select this checkbox, and then click the emph.../emph button to define the similarity options./ahelp/paragraph /section ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source include/basic
basctl/source/basicide/baside2b.cxx| 29 +++--
basic/source/classes/codecompletecache.cxx |6 +++---
basic/source/classes/sbxmod.cxx| 29 ++---
include/basic/codecompletecache.hxx|2 +-
4 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit 7ab327e24930a7e6fc3f72fcad94093dee7e2ce3
Author: Gergo Mocsi gmocs...@gmail.com
Date: Mon Aug 19 13:53:38 2013 +0200
GSOC work, autocorrect procedures+variables
Fixed some small issue with the right arrow key in the ListBox.
Autocorrection now correct all variable types and procedure names.
Change-Id: Iff1abaf10c621aef04772837faa272bb6f987e37
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index c8bdb63..4584692 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -584,11 +584,12 @@ void EditorWindow::HandleAutoCorrect()
if( CodeCompleteOptions::IsExtendedTypeDeclaration() )
{
rModulWindow.UpdateModule();
-
rModulWindow.GetSbModule()-GetCodeCompleteDataFromParse(aCodeCompleteCache);
+rModulWindow.GetSbModule()-GetCodeCompleteDataFromParse(
aCodeCompleteCache );
}
TextSelection aSel = GetEditView()-GetSelection();
sal_uLong nLine = aSel.GetStart().GetPara();
OUString aLine( pEditEngine-GetText( nLine ) ); // the line being modified
+const OUString sActSubName = GetActualSubName( nLine ); // the actual
procedure
HighlightPortions aPortions;
aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
@@ -619,14 +620,30 @@ void EditorWindow::HandleAutoCorrect()
}
if( r.tokenType == TT_IDENTIFIER )
{// correct uno types
-OUString sStr = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
-if( sStr != aCodeCompleteCache.GetCorrectCaseVarName(sStr) )
+const OUString sVarName = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
+if( !aCodeCompleteCache.GetCorrectCaseVarName( sVarName, sActSubName
).isEmpty() )
{
-sStr = aCodeCompleteCache.GetCorrectCaseVarName(sStr);
+const OUString sStr = aCodeCompleteCache.GetCorrectCaseVarName(
sVarName, sActSubName );
TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
pEditEngine-ReplaceText( sTextSelection, sStr );
pEditView-SetSelection( aSel );
+return;
+}
+
+//autocorrect procedures
+SbxArray* pArr = rModulWindow.GetSbModule()-GetMethods();
+for( sal_uInt32 i=0; i pArr-Count32(); ++i )
+{
+if( pArr-Get32(i)-GetName().equalsIgnoreAsciiCase( sVarName ) )
+{
+const OUString sStr = pArr-Get32(i)-GetName();
+TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
+TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
+pEditEngine-ReplaceText( sTextSelection, sStr );
+pEditView-SetSelection( aSel );
+return;
+}
}
}
}
@@ -780,7 +797,7 @@ void EditorWindow::HandleCodeCompletition()
TextPaM aStart(nLine, aLine.indexOf(sBaseName) );
TextPaM aEnd(nLine, aLine.indexOf(sBaseName) +
sBaseName.getLength() );
TextSelection sTextSelection(aStart, aEnd);
-pEditEngine-ReplaceText( sTextSelection,
aCodeCompleteCache.GetCorrectCaseVarName(sBaseName) );
+pEditEngine-ReplaceText( sTextSelection,
aCodeCompleteCache.GetCorrectCaseVarName(sBaseName, GetActualSubName(nLine)) );
pEditView-SetSelection( aSel );
}
@@ -2632,7 +2649,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent
rKeyEvt )
case KEY_RIGHT:
{
TextSelection aTextSelection(
GetParentEditView()-GetSelection() );
-if( aTextSelection.GetEnd().GetPara() !=
pCodeCompleteWindow-GetTextSelection().GetEnd().GetPara() )
+if( aTextSelection.GetEnd().GetPara() !=
pCodeCompleteWindow-GetTextSelection().GetEnd().GetPara()-1 )
{
HideAndRestoreFocus();
}
diff --git a/basic/source/classes/codecompletecache.cxx
b/basic/source/classes/codecompletecache.cxx
index 9d78455..a5b9ce6 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -182,20 +182,20 @@ OUString CodeCompleteDataCache::GetVarType( const
OUString sVarName ) const
return OUString(); //not found
}
-OUString CodeCompleteDataCache::GetCorrectCaseVarName( const OUString
sVarName ) const
+OUString CodeCompleteDataCache::GetCorrectCaseVarName( const OUString
sVarName, const OUString sActProcName ) const
{
for(
[Libreoffice-commits] core.git: 2 commits - basic/source extensions/source
basic/source/classes/sbunoobj.cxx|9 ++
extensions/source/propctrlr/stringrepresentation.cxx | 25 ++-
2 files changed, 27 insertions(+), 7 deletions(-)
New commits:
commit 4b2c05d4f71ae9c6586b423fea802208da265765
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 19 14:15:20 2013 +0200
Simplify iteration over Sequence
Change-Id: I84b79c6cc11a5cd506e22caf294423a3c0b953f0
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index 6b8544b..9bc6907 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -3353,20 +3353,17 @@ void VBAConstantHelper::init()
}
aConstCache.push_back( sLeafName ); // assume constant group
names are unique
Sequence Reference XConstantTypeDescription aConsts =
xConstants-getConstants();
-Reference XConstantTypeDescription * pSrc =
aConsts.getArray();
-sal_Int32 nLen = aConsts.getLength();
-for ( sal_Int32 index =0; indexnLen; ++pSrc, ++index )
+for (sal_Int32 i = 0; i != aConsts.getLength(); ++i)
{
// store constant member name
-Reference XConstantTypeDescription rXConst = *pSrc;
-sFullName = rXConst-getName();
+sFullName = aConsts[i]-getName();
indexLastDot = sFullName.lastIndexOf('.');
sLeafName = sFullName;
if ( indexLastDot -1 )
{
sLeafName = sFullName.copy( indexLastDot + 1);
}
-aConstHash[ sLeafName.toAsciiLowerCase() ] =
rXConst-getConstantValue();
+aConstHash[ sLeafName.toAsciiLowerCase() ] =
aConsts[i]-getConstantValue();
}
}
}
commit def066bb6559e8c77eeb924db1356f9848f5c8a2
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 19 14:10:41 2013 +0200
fdo#67109: Order of XConstantsTypeDescription.getConstants is unspecified
...it looks like it used to be the order the constants appeared in the .idl
file, while now it happens to be the lexicographical order of the constant's
names. For all the constant groups in com.sun.star.report the order
expected by
the code appears to be the order of the constant's numeric values (which
happens
to coincide with the order of appearance in the .idl files), so explicitly
sort
them that way.
Change-Id: I550401b2742fffb7c96a7787498967a7cd78fff8
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx
b/extensions/source/propctrlr/stringrepresentation.cxx
index 89228a0..e39fb9c 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -32,6 +32,7 @@
#include com/sun/star/util/Date.hpp
#include com/sun/star/util/Time.hpp
#include comphelper/sequence.hxx
+#include comphelper/sequenceasvector.hxx
#include connectivity/dbconversion.hxx
#include formresid.hrc
#include tools/debug.hxx
@@ -223,6 +224,24 @@ uno::Any SAL_CALL
StringRepresentation::convertToPropertyValue(const OUString
return aReturn;
}
+namespace {
+
+// This comparison functor assumes an underlying set of constants with pairwise
+// unequal values that are all of UNO SHORT or LONG type:
+struct CompareConstants {
+bool operator ()(
+css::uno::Reference css::reflection::XConstantTypeDescription const
+c1,
+css::uno::Reference css::reflection::XConstantTypeDescription const
+c2) const
+{
+return c1-getConstantValue().getsal_Int32()
+ c2-getConstantValue().getsal_Int32();
+}
+};
+
+}
+
// lang::XInitialization:
void SAL_CALL StringRepresentation::initialize(const uno::Sequence uno::Any
aArguments) throw (uno::RuntimeException, uno::Exception)
{
@@ -244,7 +263,11 @@ void SAL_CALL StringRepresentation::initialize(const
uno::Sequence uno::Any
uno::UNO_QUERY_THROW );
m_xTypeDescription.set( xTypeDescProv-getByHierarchicalName(
sConstantName ), uno::UNO_QUERY_THROW );
-m_aConstants = m_xTypeDescription-getConstants();
+comphelper::SequenceAsVector
+uno::Reference reflection::XConstantTypeDescription
+cs(m_xTypeDescription-getConstants());
+std::sort(cs.begin(), cs.end(), CompareConstants());
+cs m_aConstants;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 508e8dd2e2cf54e3c0867b0a8340e477da3afee5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Aug 19 14:22:02 2013 +0200 Fix mingw64 build of remote control Change-Id: Ic236a52311a5bd868daa50851a2a88c92c377f51 diff --git a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h index 314e379..2ed2e32 100755 --- a/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h +++ b/sd/source/ui/remotecontrol/mDNSResponder/CommonServices.h @@ -474,7 +474,7 @@ typedef int socklen_t; // - Windows #if ( TARGET_LANGUAGE_C_LIKE ) -#if ( !defined(_SSIZE_T) ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) !TARGET_OS_FREEBSD !TARGET_OS_LINUX !TARGET_OS_VXWORKS !TARGET_OS_MAC) +#if ( !defined(_SSIZE_T) ( TARGET_OS_WIN32 || !defined( _BSD_SSIZE_T_DEFINED_ ) ) !TARGET_OS_FREEBSD !TARGET_OS_LINUX !TARGET_OS_VXWORKS !TARGET_OS_MAC !defined (__MINGW32__)) typedef int ssize_t; #endif #endif @@ -759,7 +759,8 @@ typedef INT32 int32_t; typedef UINT32 uint32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; - +#elif defined (__MINGW32__) +# include stdint.h #elif ( TARGET_OS_VXWORKS ( TORNADO_VERSION 220 ) ) typedef long long int64_t; typedef unsigned long long uint64_t; @@ -785,7 +786,7 @@ typedef uint16_t uint_fast16_t; typedef uint32_t uint_fast32_t; typedef uint64_t uint_fast64_t; -#if ( !defined( _MSC_VER ) || TARGET_OS_WINDOWS_CE ) +#if ( !defined( _WIN32 ) || TARGET_OS_WINDOWS_CE ) typedef long int intptr_t; typedef unsigned long int uintptr_t; #endif ___ 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 099d6020fed3a7e30cd18a3d970a927cc88151ec Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 14:26:50 2013 +0100 Updated core Project: help 0928f7ad945adabae18d618d9c63c12a6472ff8a diff --git a/helpcontent2 b/helpcontent2 index 50fb482..0928f7a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 50fb4825f0debbcff34a6110e66caaae2674fba5 +Subproject commit 0928f7ad945adabae18d618d9c63c12a6472ff8a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst|9 - source/text/swriter/01/0214.xhp |4 ++-- source/text/swriter/01/04090001.xhp | 30 +++--- source/text/swriter/01/04090002.xhp |2 +- source/text/swriter/01/04090005.xhp |2 +- 5 files changed, 19 insertions(+), 28 deletions(-) New commits: commit 0928f7ad945adabae18d618d9c63c12a6472ff8a Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 14:26:50 2013 +0100 update help ids for document field page .ui conversion Change-Id: I6e643c3fdb225c9abd463838e2069822d6fe26b7 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 0598e47..0d7df5c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1735,7 +1735,6 @@ HID_FLDEDT_ADDRESS,53049, HID_FLDVAR_APPLY,53047, HID_FLDVAR_DELETE,53048, HID_FLD_DB,53205, -HID_FLD_DOK,53208, HID_FLD_DROPDOWN,54954, HID_FLD_REF,53210, HID_FLD_VAR,53207, @@ -7408,7 +7407,6 @@ sw_CheckBox_DLG_MM_MERGE_PAGE_CB_WHOLEWORDS,898286600, sw_CheckBox_DLG_MM_PREPAREMERGE_PAGE_CB_EXCLUDE,898270216, sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186, sw_CheckBox_TP_CONDCOLL_CB_CONDITION,878445569, -sw_CheckBox_TP_FLD_DOK_CB_DOKFIXEDCONTENT,878756922, sw_CheckBox_TP_FLD_VAR_CB_VARINVISIBLE,878740520, sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196, sw_CheckBox_TP_GRF_EXT_CB_HOR,878232622, @@ -7479,7 +7477,6 @@ sw_Edit_DLG_MM_SAVEWARNING_ED_FILENAME,1435453444, sw_Edit_DLG_MM_SELECTADDRESSBLOCK_ED_COUNTRY,1435322396, sw_Edit_TP_FLD_DB_ED_DBCONDITION,878708744, sw_Edit_TP_FLD_DB_ED_DBSETNUMBER,878708745, -sw_Edit_TP_FLD_DOK_ED_DOKVALUE,878757943, sw_Edit_TP_FLD_REF_ED_REFNAME,878790744, sw_Edit_TP_FLD_REF_ED_REFVALUE,878790746, sw_Edit_TP_FLD_VAR_ED_VARNAME,878741535, @@ -7549,10 +7546,6 @@ sw_ListBox_TP_CONDCOLL_LB_STYLE,878448135, sw_ListBox_TP_FLD_DB_LB_DBFORMAT,878710282, sw_ListBox_TP_FLD_DB_LB_DBNUMFORMAT,878710283, sw_ListBox_TP_FLD_DB_LB_DBTYPE,878710274, -sw_ListBox_TP_FLD_DOK_LB_DOKFORMAT,878759476, -sw_ListBox_TP_FLD_DOK_LB_DOKNUMFORMAT,878759475, -sw_ListBox_TP_FLD_DOK_LB_DOKSELECTION,878759474, -sw_ListBox_TP_FLD_DOK_LB_DOKTYPE,878759472, sw_ListBox_TP_FLD_REF_LB_REFFORMAT,878792277, sw_ListBox_TP_FLD_REF_LB_REFSELECTION,878792275, sw_ListBox_TP_FLD_REF_LB_REFTYPE,878792273, @@ -7645,8 +7638,6 @@ sw_NumericField_DLG_MM_OUTPUT_PAGE_NF_TO,898308114, sw_NumericField_DLG_MM_PREPAREMERGE_PAGE_ED_RECORD,898275333, sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141, sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139, -sw_NumericField_TP_FLD_DOK_ED_DOKDATEOFF,878762041, -sw_NumericField_TP_FLD_DOK_ED_DOKLEVEL,878762040, sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073, sw_NumericField_TP_LINENUMBERING_NF_NUM_INVERVAL,878893067, sw_NumericField_TP_NUMPARA_NF_NEW_START,878860294, diff --git a/source/text/swriter/01/0214.xhp b/source/text/swriter/01/0214.xhp index b6523a7..962743a 100644 --- a/source/text/swriter/01/0214.xhp +++ b/source/text/swriter/01/0214.xhp @@ -45,8 +45,8 @@ paragraph role=note id=par_id3151371 xml-lang=en-US l10n=U oldref=13The following dialog elements are only visible when the corresponding field type is selected./paragraph paragraph role=heading id=hd_id3150687 xml-lang=en-US level=2 l10n=U oldref=56Select/paragraph paragraph role=paragraph id=par_id3150700 xml-lang=en-US l10n=U oldref=57Lists the field options, for example, fixed. If you want, you can click another option for the selected field type./paragraph -bookmark xml-lang=en-US branch=hid/sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT id=bm_id3155866 localize=false/paragraph role=heading id=hd_id3155854 xml-lang=en-US level=2 l10n=U oldref=11Format/paragraph -paragraph role=paragraph id=par_id3147409 xml-lang=en-US l10n=U oldref=12ahelp hid=SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMATSelect the format for the contents of the field. For date, time, and user-defined fields, you can also click Additional formats in the list, and then choose a different format./ahelp The formats that are available depend on the type of field that you are editing./paragraph +bookmark xml-lang=en-US branch=hid/modules/swriter/ui/flddocumentpage/numformat id=bm_id3155866 localize=false/paragraph role=heading id=hd_id3155854 xml-lang=en-US level=2 l10n=U oldref=11Format/paragraph +paragraph role=paragraph id=par_id3147409 xml-lang=en-US l10n=U oldref=12ahelp hid=modules/swriter/ui/flddocumentpage/numformatSelect the format for the contents of the field. For date, time, and user-defined fields, you can also click Additional formats in the list, and then choose a different format./ahelp The formats that are available depend on the type of field that you are editing./paragraph paragraph role=heading id=hd_id3149556 xml-lang=en-US level=2 l10n=U oldref=24Offset/paragraph paragraph role=paragraph id=par_id3145256 xml-lang=en-US l10n=CHG oldref=25Displays the offset for the selected field type, for example,
[Libreoffice-commits] core.git: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Common.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 33b631c483e017e9ba9430034eb659f085093944 Author: Ivan Timofeev timofeev@gmail.com Date: Sun Aug 18 19:26:04 2013 +0400 fdo#67653: Revert go back to 8 colorvalueset columns This reverts commit 7e7ccea7cc91e86d7d345b85940dba16bec36fc4. Change-Id: Idc09233ccd53a7368da978bb7c1a04a640118e62 Reviewed-on: https://gerrit.libreoffice.org/5503 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c1e96a1..ac9ed45 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -6262,7 +6262,7 @@ /desc labelDefines the number of columns that will be shown in a ColorValueSet./label /info -value8/value +value12/value /prop prop oor:name=PreviewUsesCheckeredBackground oor:type=xs:boolean info ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2b.cxx | 50 +++-
1 file changed, 22 insertions(+), 28 deletions(-)
New commits:
commit efb6b286d6a3d879533420d57dd80ced590c055b
Author: Gergo Mocsi gmocs...@gmail.com
Date: Mon Aug 19 15:52:01 2013 +0200
GSOC work, small fixes
Some code fixes in function EditorWindow::HandleAutoCorrect():
updating the module and getting the data from parse is necessary(not just
when code complete is on).
Removed some duplicate code when checking for the type of the actual
highlight portion.
Change-Id: I29a62dae23f2c28e54f9185ac59ff2747c64e0d7
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 4584692..2e06232 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -581,11 +581,8 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
void EditorWindow::HandleAutoCorrect()
{
-if( CodeCompleteOptions::IsExtendedTypeDeclaration() )
-{
-rModulWindow.UpdateModule();
-rModulWindow.GetSbModule()-GetCodeCompleteDataFromParse(
aCodeCompleteCache );
-}
+rModulWindow.UpdateModule();
+rModulWindow.GetSbModule()-GetCodeCompleteDataFromParse(
aCodeCompleteCache );
TextSelection aSel = GetEditView()-GetSelection();
sal_uLong nLine = aSel.GetStart().GetPara();
OUString aLine( pEditEngine-GetText( nLine ) ); // the line being modified
@@ -598,32 +595,29 @@ void EditorWindow::HandleAutoCorrect()
return;
HighlightPortion r = aPortions[aPortions.size()-1];
-if( r.tokenType == TT_KEYWORDS ) // correct the last entered keyword
+OUString sStr = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
+if( r.tokenType == TT_KEYWORDS !sStr.isEmpty() ) // correct the last
entered keyword
{
-OUString sStr = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
-if( !sStr.isEmpty() )
-{
-sStr = sStr.toAsciiLowerCase();
-if( !rModulWindow.GetSbModule()-GetKeywordCase(sStr).isEmpty() )
-// if it is a keyword, get its correct case
-sStr = rModulWindow.GetSbModule()-GetKeywordCase(sStr);
-else
-{// else capitalize first letter/select the correct one, and
replace
-sStr = sStr.replaceAt( 0, 1,
OUString(sStr[0]).toAsciiUpperCase() );
-}
-
-TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
-TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
-pEditEngine-ReplaceText( sTextSelection, sStr );
-pEditView-SetSelection( aSel );
+sStr = sStr.toAsciiLowerCase();
+if( !rModulWindow.GetSbModule()-GetKeywordCase(sStr).isEmpty() )
+// if it is a keyword, get its correct case
+sStr = rModulWindow.GetSbModule()-GetKeywordCase(sStr);
+else
+{// else capitalize first letter/select the correct one, and replace
+sStr = sStr.replaceAt( 0, 1, OUString(sStr[0]).toAsciiUpperCase()
);
}
+
+TextPaM aStart(nLine, aSel.GetStart().GetIndex() - sStr.getLength() );
+TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
+pEditEngine-ReplaceText( sTextSelection, sStr );
+pEditView-SetSelection( aSel );
+return;
}
if( r.tokenType == TT_IDENTIFIER )
-{// correct uno types
-const OUString sVarName = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
-if( !aCodeCompleteCache.GetCorrectCaseVarName( sVarName, sActSubName
).isEmpty() )
+{// correct variables
+if( !aCodeCompleteCache.GetCorrectCaseVarName( sStr, sActSubName
).isEmpty() )
{
-const OUString sStr = aCodeCompleteCache.GetCorrectCaseVarName(
sVarName, sActSubName );
+sStr = aCodeCompleteCache.GetCorrectCaseVarName( sStr, sActSubName
);
TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
pEditEngine-ReplaceText( sTextSelection, sStr );
@@ -635,9 +629,9 @@ void EditorWindow::HandleAutoCorrect()
SbxArray* pArr = rModulWindow.GetSbModule()-GetMethods();
for( sal_uInt32 i=0; i pArr-Count32(); ++i )
{
-if( pArr-Get32(i)-GetName().equalsIgnoreAsciiCase( sVarName ) )
+if( pArr-Get32(i)-GetName().equalsIgnoreAsciiCase( sStr ) )
{
-const OUString sStr = pArr-Get32(i)-GetName();
+sStr = pArr-Get32(i)-GetName(); //get the correct case
TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
pEditEngine-ReplaceText( sTextSelection, sStr );
___
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/ndole.hxx |8
sw/source/core/ole/ndole.cxx | 30 ++
2 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 83d874ec13f6bf260f3f4093fd1613bea23bf27c
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sat Aug 17 11:47:04 2013 +0200
String to OUString, some small cleanup
Change-Id: I2cb6b2c2169e5ba72ac8866f4a797421bd779a8b
Reviewed-on: https://gerrit.libreoffice.org/5473
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 3a80cea..8c65ae4 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -39,7 +39,7 @@ class SW_DLLPUBLIC SwOLEObj
/** Either ref or name are known. If only name is known, ref is obtained
on demand by GetOleRef() from Sfx. */
svt::EmbeddedObjectRef xOLERef;
-String aName;
+OUString aName;
SwOLEObj( const SwOLEObj rObj ); /// Not allowed.
SwOLEObj();
@@ -48,7 +48,7 @@ class SW_DLLPUBLIC SwOLEObj
public:
SwOLEObj( const svt::EmbeddedObjectRef pObj );
-SwOLEObj( const String rName, sal_Int64 nAspect );
+SwOLEObj( const OUString rName, sal_Int64 nAspect );
~SwOLEObj();
sal_Bool UnloadObject();
@@ -56,11 +56,11 @@ public:
const SwDoc* pDoc,
sal_Int64 nAspect );
-String GetDescription();
+OUString GetDescription();
const com::sun::star::uno::Reference
com::sun::star::embed::XEmbeddedObject GetOleRef();
svt::EmbeddedObjectRef GetObject();
-const String GetCurrentPersistName() const { return aName; }
+OUString GetCurrentPersistName() const { return aName; }
sal_Bool IsOleRef() const; /// To avoid unneccessary loading of object.
};
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 1f74ff5..432037b 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -298,7 +298,7 @@ sal_Bool SwOLENode::RestorePersistentData()
if ( xChild.is() )
xChild-setParent( p-GetModel() );
-OSL_ENSURE( aOLEObj.aName.Len(), No object name! );
+OSL_ENSURE( !aOLEObj.aName.isEmpty(), No object name! );
OUString aObjName;
if ( !p-GetEmbeddedObjectContainer().InsertEmbeddedObject(
aOLEObj.xOLERef.GetObject(), aObjName ) )
{
@@ -668,7 +668,7 @@ SwOLEObj::SwOLEObj( const svt::EmbeddedObjectRef xObj ) :
}
-SwOLEObj::SwOLEObj( const String rString, sal_Int64 nAspect ) :
+SwOLEObj::SwOLEObj( const OUString rString, sal_Int64 nAspect ) :
pOLENd( 0 ),
pListener( 0 ),
aName( rString )
@@ -737,7 +737,7 @@ SwOLEObj::~SwOLEObj()
void SwOLEObj::SetNode( SwOLENode* pNode )
{
pOLENd = pNode;
-if ( !aName.Len() )
+if ( aName.isEmpty() )
{
SwDoc* pDoc = pNode-GetDoc();
@@ -895,22 +895,20 @@ sal_Bool SwOLEObj::UnloadObject( uno::Reference
embed::XEmbeddedObject xObj,
return bRet;
}
-String SwOLEObj::GetDescription()
+OUString SwOLEObj::GetDescription()
{
-String aResult;
uno::Reference embed::XEmbeddedObject xEmbObj = GetOleRef();
-if ( xEmbObj.is() )
-{
-SvGlobalName aClassID( xEmbObj-getClassID() );
-if ( SotExchange::IsMath( aClassID ) )
-aResult = SW_RESSTR(STR_MATH_FORMULA);
-else if ( SotExchange::IsChart( aClassID ) )
-aResult = SW_RESSTR(STR_CHART);
-else
-aResult = SW_RESSTR(STR_OLE);
-}
+if ( !xEmbObj.is() )
+return OUString();
+
+SvGlobalName aClassID( xEmbObj-getClassID() );
+if ( SotExchange::IsMath( aClassID ) )
+return SW_RESSTR(STR_MATH_FORMULA);
+
+if ( SotExchange::IsChart( aClassID ) )
+return SW_RESSTR(STR_CHART);
-return aResult;
+return SW_RESSTR(STR_OLE);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH][RESEND] Writer - cross-references to numbered paragraphs still wrong (bug ID 36960)
Bug 36960 was never fixed correctly (or rather, I suspect it was fixed, then
broken when work was done to make the tests pass). The attached patch fixes
the bug and adds new tests for cross-references to numbered paragraphs. The
nature of the bug is that if you have numbered paragraphs like this:
1. one
(a) two
(b) three
2. four
(a) five
a cross reference in paragraph 2(a), to paragraph 1(a), returns 1.(a), which
is not correct.
CheckCrossReferences.odt
Description: application/vnd.oasis.opendocument.text
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 27b2cb9..66be2d8e 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -739,7 +739,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum rNodeNum,
if ( rNodeNum.GetLevelInListTree() = 0 )
{
bool bOldHadPrefix = true;
-bool bFirstIteration = true;
OUString sOldPrefix;
const SwNodeNum* pWorkingNodeNum( rNodeNum );
@@ -779,7 +778,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum rNodeNum,
aExtremities.nPrefixChars -= nStrip;
}
-if ((bFirstIteration || bOldHadPrefix)
+if ((bOldHadPrefix)
aExtremities.nSuffixChars
!aExtremities.nPrefixChars
)
@@ -788,10 +787,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum rNodeNum,
while (aPrevStr.Len() - nStrip2 aExtremities.nSuffixChars)
{
char const cur = aPrevStr.GetChar(nStrip2);
-if (!bFirstIteration '\t' != cur ' ' != cur)
-{
-break;
-}
--nStrip2;
}
if (nStrip2 aPrevStr.Len())
@@ -799,7 +794,7 @@ String SwNumRule::MakeRefNumString( const SwNodeNum rNodeNum,
aPrevStr.Erase(nStrip2, aPrevStr.Len() - nStrip2);
}
}
-else if (sOldPrefix.getLength())
+else if (!aExtremities.nSuffixChars !bOldHadPrefix)
{
aRefNumStr.Insert(sOldPrefix, 0);
}
@@ -809,11 +804,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum rNodeNum,
aRefNumStr.Insert( aPrevStr, 0 );
}
-else if ( aRefNumStr.Len() 0 )
-{
-sOldPrefix += ;
-bOldHadPrefix = true;
-}
if ( bInclSuperiorNumLabels pWorkingNodeNum-GetLevelInListTree() 0 )
{
@@ -830,7 +820,6 @@ String SwNumRule::MakeRefNumString( const SwNodeNum rNodeNum,
{
break;
}
-bFirstIteration = false;
} while ( pWorkingNodeNum
pWorkingNodeNum-GetLevelInListTree() = 0
static_castsal_uInt8(pWorkingNodeNum-GetLevelInListTree()) = nRestrictInclToThisLevel );
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
crach in writer
Hi your patch with commit-id(0d9ddccd8810a81a6f4d737870969d0dcf367d23) making crach in writer when you write a RTL string followed by numbers(at least 2). so, can you fix this problem . Warm Regards, Abdulaziz Ayed Alayed developer at Motah Program , KACST http://www.motah.org.sa Warning: This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. ?: ??? ??? ??? ? ?? ?? (?? ) ? ?? ? ??? ??? ? ? ???. ??? ?? ??? ? ?? ??? ? ??? ?? ? ??? ? (?? )? ??? ?? ??? ?? ? ??? ??? ?? (?? ) ?? ?? ??? ? ?? ? ?? ? ?? ? ??? ???. ? ??? ??? ??? ? (?? ) ?? ??? ??? ??? ? ? ? ?? ??? ? ??? ? ??? ?? ??? ?? ??? ??? ?? ?? ?? ?? ??? ??. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/fesh.hxx |8
sw/inc/frmfmt.hxx| 10 --
sw/inc/ndnotxt.hxx | 10 --
sw/source/core/access/accnotextframe.cxx |2 +-
sw/source/core/access/acctextframe.cxx |2 +-
sw/source/core/doc/doclay.cxx|8
sw/source/core/docnode/ndnotxt.cxx | 24 ++--
sw/source/core/frmedt/fefly1.cxx | 30 ++
sw/source/core/layout/atrfrm.cxx | 24 ++--
9 files changed, 48 insertions(+), 70 deletions(-)
New commits:
commit edba90dc39fc3141a8a9e441aa97b46baa4c6ca2
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sat Aug 17 12:53:07 2013 +0200
String to OUString + whitespaces, log messages
Change-Id: I76014ecb4dd0f040b6770965cb690cc9839bedb5
Reviewed-on: https://gerrit.libreoffice.org/5474
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 7f9499f..43a8a95 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -338,10 +338,10 @@ public:
const Graphic *GetGrfAtPos( const Point rDocPos,
String rName, sal_Bool rbLink ) const;
-const String GetObjTitle() const;
-void SetObjTitle( const String rTitle );
-const String GetObjDescription() const;
-void SetObjDescription( const String rDescription );
+OUString GetObjTitle() const;
+void SetObjTitle( const OUString rTitle );
+OUString GetObjDescription() const;
+void SetObjDescription( const OUString rDescription );
sal_Bool IsFrmSelected() const;
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index bf016ee..c6e5ebf 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -175,12 +175,10 @@ public:
virtual bool GetInfo( SfxPoolItem rInfo ) const;
-const String GetObjTitle() const;
-void SetObjTitle( const String rTitle,
- bool bBroadcast = false );
-const String GetObjDescription() const;
-void SetObjDescription( const String rDescription,
-bool bBroadcast = false );
+OUString GetObjTitle() const;
+void SetObjTitle( const OUString rTitle, bool bBroadcast = false );
+OUString GetObjDescription() const;
+void SetObjDescription( const OUString rDescription, bool bBroadcast =
false );
/** SwFlyFrmFmt::IsBackgroundTransparent
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 0cb7151..f9d65c5 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -60,12 +60,10 @@ public:
virtual sal_Bool SavePersistentData();
virtual sal_Bool RestorePersistentData();
-const String GetTitle() const;
-void SetTitle( const String rTitle,
- bool bBroadcast = false );
-const String GetDescription() const;
-void SetDescription( const String rDescription,
- bool bBroadcast = false );
+OUString GetTitle() const;
+void SetTitle( const OUString rTitle, bool bBroadcast = false );
+OUString GetDescription() const;
+void SetDescription( const OUString rDescription, bool bBroadcast = false
);
void SetContour( const PolyPolygon *pPoly,
sal_Bool bAutomatic = sal_False );
diff --git a/sw/source/core/access/accnotextframe.cxx
b/sw/source/core/access/accnotextframe.cxx
index 1cbf2f6..34224f5 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -110,7 +110,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem*
pOld, const SfxPoolItem
aEvent.NewValue = msTitle;
FireAccessibleEvent( aEvent );
-if ( pNd-GetDescription().Len() != 0 )
+if ( !pNd-GetDescription().isEmpty() )
{
break;
}
diff --git a/sw/source/core/access/acctextframe.cxx
b/sw/source/core/access/acctextframe.cxx
index 17e1a42..b805e56 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -105,7 +105,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem*
pOld, const SfxPoolItem *
const SwFlyFrmFmt* pFlyFrmFmt =
dynamic_castconst SwFlyFrmFmt*(
pFlyFrm-GetFmt() );
-if ( pFlyFrmFmt-GetObjDescription().Len() != 0 )
+if ( !pFlyFrmFmt-GetObjDescription().isEmpty() )
{
break;
}
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index c8cbb27..e2bf370 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1214,12 +1214,12 @@ lcl_InsertLabel(SwDoc rDoc, SwTxtFmtColls *const
pTxtFmtCollTbl,
// title and description attributes are lost when calling
DelFrms().
// Thus, keep them and
[Libreoffice-commits] core.git: sw/inc sw/source
sw/inc/ndole.hxx| 12 ++--
sw/source/core/ole/ndole.cxx| 16
sw/source/core/unocore/unochart.cxx |2 +-
sw/source/core/view/viewsh.cxx |2 +-
sw/source/filter/xml/xmltexte.cxx |2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit b862b8d5757cd031f361e5960dff8b149d16b615
Author: Matteo Casalin matteo.casa...@yahoo.com
Date: Sat Aug 17 13:47:15 2013 +0200
String to OUString
Change-Id: Ib028b0846fca69ae678ff02d551eb369a59bc129
Reviewed-on: https://gerrit.libreoffice.org/5475
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 8c65ae4..650b1b8 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -73,12 +73,12 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
friend class SwNodes;
mutable SwOLEObj aOLEObj;
Graphic*pGraphic;
-String sChartTblName; /// with chart objects: name of referenced
table.
+OUString sChartTblName; /// with chart objects: name of referenced
table.
sal_Bool bOLESizeInvalid; /** Should be considered at
SwDoc::PrtOLENotify
(e.g. copied). Is not persistent. */
SwEmbedObjectLink* mpObjectLink;
-String maLinkURL;
+OUString maLinkURL;
SwOLENode( const SwNodeIndex rWhere,
const svt::EmbeddedObjectRef,
@@ -86,7 +86,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
SwAttrSet* pAutoAttr = 0 );
SwOLENode( const SwNodeIndex rWhere,
-const String rName,
+const OUString rName,
sal_Int64 nAspect,
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr = 0 );
@@ -126,7 +126,7 @@ public:
/** Remove OLE-object from memory.
inline void Unload() { aOLEObj.Unload(); } */
-String GetDescription() const { return aOLEObj.GetDescription(); }
+OUString GetDescription() const { return aOLEObj.GetDescription(); }
sal_Bool UpdateLinkURL_Impl();
void BreakFileLink_Impl();
@@ -137,8 +137,8 @@ public:
// #i99665#
bool IsChart() const;
-const String GetChartTblName() const { return sChartTblName; }
-void SetChartTblName( const String rNm ) { sChartTblName = rNm; }
+OUString GetChartTblName() const { return sChartTblName; }
+void SetChartTblName( const OUString rNm ) { sChartTblName = rNm; }
};
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 432037b..93bd4dd 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -243,7 +243,7 @@ SwOLENode::SwOLENode( const SwNodeIndex rWhere,
}
SwOLENode::SwOLENode( const SwNodeIndex rWhere,
-const String rString,
+const OUString rString,
sal_Int64 nAspect,
SwGrfFmtColl *pGrfColl,
SwAttrSet* pAutoAttr ) :
@@ -359,7 +359,7 @@ sal_Bool SwOLENode::SavePersistentData()
bChartWithInternalProvider = sal_True;
}
- if ( IsChart() sChartTblName.Len()
!bChartWithInternalProvider )
+ if ( IsChart() !sChartTblName.isEmpty()
!bChartWithInternalProvider )
bKeepObjectToTempStorage = sal_False;
pCnt-RemoveEmbeddedObject( aOLEObj.aName, sal_False,
bKeepObjectToTempStorage );
// modify end
@@ -535,9 +535,9 @@ sal_Bool SwOLENode::UpdateLinkURL_Impl()
if ( mpObjectLink )
{
-String aNewLinkURL;
+OUString aNewLinkURL;
GetDoc()-GetLinkManager().GetDisplayNames( mpObjectLink, 0,
aNewLinkURL, 0, 0 );
-if ( !aNewLinkURL.EqualsIgnoreCaseAscii( maLinkURL ) )
+if ( !aNewLinkURL.equalsIgnoreAsciiCase( maLinkURL ) )
{
if ( !aOLEObj.xOLERef.is() )
aOLEObj.GetOleRef();
@@ -556,7 +556,7 @@ sal_Bool SwOLENode::UpdateLinkURL_Impl()
// TODO/LATER: there should be possible to get current
mediadescriptor settings from the object
uno::Sequence beans::PropertyValue aArgs( 1 );
aArgs[0].Name = OUString( URL );
-aArgs[0].Value = OUString( aNewLinkURL );
+aArgs[0].Value = aNewLinkURL;
xPersObj-reload( aArgs, uno::Sequence
beans::PropertyValue () );
maLinkURL = aNewLinkURL;
@@ -593,7 +593,7 @@ void SwOLENode::BreakFileLink_Impl()
uno::Reference embed::XLinkageSupport xLinkSupport(
aOLEObj.GetOleRef(), uno::UNO_QUERY_THROW );
xLinkSupport-breakLink( xStorage,
aOLEObj.GetCurrentPersistName() );
DisconnectFileLink_Impl();
-maLinkURL = String();
+maLinkURL = OUString();
}
catch( uno::Exception )
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - extensions/source
extensions/source/propctrlr/stringrepresentation.cxx | 25 ++-
1 file changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 90826f5ee457449d78608e00bf05be412a86faf4
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 19 14:10:41 2013 +0200
fdo#67109: Order of XConstantsTypeDescription.getConstants is unspecified
...it looks like it used to be the order the constants appeared in the .idl
file, while now it happens to be the lexicographical order of the constant's
names. For all the constant groups in com.sun.star.report the order
expected by
the code appears to be the order of the constant's numeric values (which
happens
to coincide with the order of appearance in the .idl files), so explicitly
sort
them that way.
Change-Id: I550401b2742fffb7c96a7787498967a7cd78fff8
(cherry picked from commit def066bb6559e8c77eeb924db1356f9848f5c8a2)
Reviewed-on: https://gerrit.libreoffice.org/5512
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx
b/extensions/source/propctrlr/stringrepresentation.cxx
index a68c8d0..4c8d4aa 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -32,6 +32,7 @@
#include com/sun/star/util/Date.hpp
#include com/sun/star/util/Time.hpp
#include comphelper/sequence.hxx
+#include comphelper/sequenceasvector.hxx
#include connectivity/dbconversion.hxx
#include formresid.hrc
#include tools/debug.hxx
@@ -223,6 +224,24 @@ uno::Any SAL_CALL
StringRepresentation::convertToPropertyValue(const OUString
return aReturn;
}
+namespace {
+
+// This comparison functor assumes an underlying set of constants with pairwise
+// unequal values that are all of UNO SHORT or LONG type:
+struct CompareConstants {
+bool operator ()(
+css::uno::Reference css::reflection::XConstantTypeDescription const
+c1,
+css::uno::Reference css::reflection::XConstantTypeDescription const
+c2) const
+{
+return c1-getConstantValue().getsal_Int32()
+ c2-getConstantValue().getsal_Int32();
+}
+};
+
+}
+
// lang::XInitialization:
void SAL_CALL StringRepresentation::initialize(const uno::Sequence uno::Any
aArguments) throw (uno::RuntimeException, uno::Exception)
{
@@ -244,7 +263,11 @@ void SAL_CALL StringRepresentation::initialize(const
uno::Sequence uno::Any
uno::UNO_QUERY_THROW );
m_xTypeDescription.set( xTypeDescProv-getByHierarchicalName(
sConstantName ), uno::UNO_QUERY_THROW );
-m_aConstants = m_xTypeDescription-getConstants();
+comphelper::SequenceAsVector
+uno::Reference reflection::XConstantTypeDescription
+cs(m_xTypeDescription-getConstants());
+std::sort(cs.begin(), cs.end(), CompareConstants());
+cs m_aConstants;
}
}
}
___
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' - sc/source
sc/source/filter/inc/tablebuffer.hxx |4 +++-
sc/source/filter/oox/tablebuffer.cxx | 28 +---
sc/source/filter/oox/worksheethelper.cxx |5 +
3 files changed, 33 insertions(+), 4 deletions(-)
New commits:
commit 464719988fc97c0bba6c3557ba1aed35188be8c3
Author: Noel Power noel.po...@suse.com
Date: Thu Aug 15 16:23:46 2013 +0100
fix for bnc#834705 missing drop downs for autofilter
After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order
dependency, between any ScPatternAttr flags indirectly set and
SheetDataBuffer::finalizeImport which sets the attributes directly for a
column
So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated
SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute
from SheetDataBuffer::finalizeImport - Document::SetAttrEntries
I've reordered that Table import here and split the finalize ( which happens
before heetDataBuffer::finalizeImport ) so that the databaseranges which
were
created before sheet import still happens, the autofilter part of the import
is now deferred ( until after SheetDataBuffer::finalizeImport )
Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7
(cherry picked from commit edd51b813005c2159426d8f2917eede5b14a4577)
Reviewed-on: https://gerrit.libreoffice.org/5447
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/filter/inc/tablebuffer.hxx
b/sc/source/filter/inc/tablebuffer.hxx
index 9d4a2c7..2de2d30 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -59,6 +59,7 @@ public:
/** Creates a database range from this tables. */
voidfinalizeImport();
+voidapplyAutoFilters();
/** Returns the unique table identifier. */
inline sal_Int32getTableId() const { return maModel.mnId; }
@@ -103,7 +104,8 @@ public:
/** Creates database ranges from all imported tables. */
voidfinalizeImport();
-
+/** Applies autofilters from created database range ( requires
finalizeImport to have run before being called */
+voidapplyAutoFilters();
/** Returns a table by its identifier. */
TableRefgetTable( sal_Int32 nTableId ) const;
/** Returns a table by its display name. */
diff --git a/sc/source/filter/oox/tablebuffer.cxx
b/sc/source/filter/oox/tablebuffer.cxx
index 672e11c..4dc61a0 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -20,6 +20,7 @@
#include tablebuffer.hxx
#include com/sun/star/sheet/XDatabaseRange.hpp
+#include com/sun/star/sheet/XDatabaseRanges.hpp
#include oox/helper/attributelist.hxx
#include oox/helper/binaryinputstream.hxx
#include oox/helper/propertyset.hxx
@@ -96,9 +97,6 @@ void Table::finalizeImport()
PropertySet aPropSet( xDatabaseRange );
if( !aPropSet.getProperty( mnTokenIndex, PROP_TokenIndex ) )
mnTokenIndex = -1;
-
-// filter settings
-maAutoFilters.finalizeImport( xDatabaseRange );
}
catch( Exception )
{
@@ -106,6 +104,25 @@ void Table::finalizeImport()
}
}
+void Table::applyAutoFilters()
+{
+if( !maDBRangeName.isEmpty() )
+{
+try
+{
+// get the range ( maybe we should cache the xDatabaseRange from
finalizeImport )
+PropertySet aDocProps( getDocument() );
+Reference XDatabaseRanges xDatabaseRanges(
aDocProps.getAnyProperty( PROP_DatabaseRanges ), UNO_QUERY_THROW );
+Reference XDatabaseRange xDatabaseRange(
xDatabaseRanges-getByName( maDBRangeName ), UNO_QUERY );
+maAutoFilters.finalizeImport( xDatabaseRange );
+}
+catch( Exception )
+{
+OSL_FAIL( Table::applyAutofilters - cannot create filter );
+}
+}
+}
+
//
TableBuffer::TableBuffer( const WorkbookHelper rHelper ) :
@@ -129,6 +146,11 @@ void TableBuffer::finalizeImport()
maIdTables.forEachMem( Table::finalizeImport );
}
+void TableBuffer::applyAutoFilters()
+{
+maIdTables.forEachMem( Table::applyAutoFilters );
+}
+
TableRef TableBuffer::getTable( sal_Int32 nTableId ) const
{
return maIdTables.get( nTableId );
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index bd8b9ba..c4db747 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -68,6 +68,7 @@
#include scitems.hxx
#include editutil.hxx
#include tokenarray.hxx
+#include tablebuffer.hxx
#include svl/stritem.hxx
#include editeng/editobj.hxx
@@ -946,6 +947,10 @@ void WorksheetGlobals::finalizeWorksheetImport()
{
lclUpdateProgressBar( mxRowProgress, 1.0 );
maSheetData.finalizeImport();
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/filter/inc/tablebuffer.hxx |4 +++-
sc/source/filter/oox/tablebuffer.cxx | 28 +---
sc/source/filter/oox/worksheethelper.cxx |4
3 files changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 0e059b62e4b222b2bb501d0c7798deeb1339d05d
Author: Noel Power noel.po...@suse.com
Date: Thu Aug 15 16:23:46 2013 +0100
fix for bnc#834705 missing drop downs for autofilter
After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order
dependency, between any ScPatternAttr flags indirectly set and
SheetDataBuffer::finalizeImport which sets the attributes directly for a
column
So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated
SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute
from SheetDataBuffer::finalizeImport - Document::SetAttrEntries
I've reordered that Table import here and split the finalize ( which happens
before heetDataBuffer::finalizeImport ) so that the databaseranges which
were
created before sheet import still happens, the autofilter part of the import
is now deferred ( until after SheetDataBuffer::finalizeImport )
Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7
Reviewed-on: https://gerrit.libreoffice.org/5448
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/filter/inc/tablebuffer.hxx
b/sc/source/filter/inc/tablebuffer.hxx
index 5ed673b..d162391 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -59,6 +59,7 @@ public:
/** Creates a database range from this tables. */
voidfinalizeImport();
+voidapplyAutoFilters();
/** Returns the unique table identifier. */
inline sal_Int32getTableId() const { return maModel.mnId; }
@@ -103,7 +104,8 @@ public:
/** Creates database ranges from all imported tables. */
voidfinalizeImport();
-
+/** Applies autofilters from created database range ( requires
finalizeImport to have run before being called */
+voidapplyAutoFilters();
/** Returns a table by its identifier. */
TableRefgetTable( sal_Int32 nTableId ) const;
/** Returns a table by its display name. */
diff --git a/sc/source/filter/oox/tablebuffer.cxx
b/sc/source/filter/oox/tablebuffer.cxx
index 0748e3c..87e1200 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -20,6 +20,7 @@
#include tablebuffer.hxx
#include com/sun/star/sheet/XDatabaseRange.hpp
+#include com/sun/star/sheet/XDatabaseRanges.hpp
#include oox/helper/attributelist.hxx
#include oox/helper/binaryinputstream.hxx
#include oox/helper/propertyset.hxx
@@ -97,9 +98,6 @@ void Table::finalizeImport()
PropertySet aPropSet( xDatabaseRange );
if( !aPropSet.getProperty( mnTokenIndex, PROP_TokenIndex ) )
mnTokenIndex = -1;
-
-// filter settings
-maAutoFilters.finalizeImport( xDatabaseRange );
}
catch( Exception )
{
@@ -107,6 +105,25 @@ void Table::finalizeImport()
}
}
+void Table::applyAutoFilters()
+{
+if( !maDBRangeName.isEmpty() )
+{
+try
+{
+// get the range ( maybe we should cache the xDatabaseRange from
finalizeImport )
+PropertySet aDocProps( getDocument() );
+Reference XDatabaseRanges xDatabaseRanges(
aDocProps.getAnyProperty( PROP_DatabaseRanges ), UNO_QUERY_THROW );
+Reference XDatabaseRange xDatabaseRange(
xDatabaseRanges-getByName( maDBRangeName ), UNO_QUERY );
+maAutoFilters.finalizeImport( xDatabaseRange );
+}
+catch( Exception )
+{
+OSL_FAIL( Table::applyAutofilters - cannot create filter );
+}
+}
+}
+
//
TableBuffer::TableBuffer( const WorkbookHelper rHelper ) :
@@ -130,6 +147,11 @@ void TableBuffer::finalizeImport()
maIdTables.forEachMem( Table::finalizeImport );
}
+void TableBuffer::applyAutoFilters()
+{
+maIdTables.forEachMem( Table::applyAutoFilters );
+}
+
TableRef TableBuffer::getTable( sal_Int32 nTableId ) const
{
return maIdTables.get( nTableId );
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index f736393..03bde26 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -66,6 +66,7 @@
#include worksheetbuffer.hxx
#include worksheetsettings.hxx
#include formulabuffer.hxx
+#include tablebuffer.hxx
namespace oox {
namespace xls {
@@ -943,6 +944,9 @@ void WorksheetGlobals::finalizeWorksheetImport()
{
lclUpdateProgressBar( mxRowProgress, 1.0 );
maSheetData.finalizeImport();
+// assumes getTables().finalizeImport ( which creates the
[ANN] LibreOffice 4.0.5 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of our upcoming LibreOffice 4.0.5. This will be the fifth in a series of frequent updates to our feature-packed 4.0 branch. Please be aware that LibreOffice 4.0.5 RC2 is not ready for production use, you should continue to use LibreOffice 4.0.4 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test - or checkout our manual test database for starting right away - http://manual-test.libreoffice.org/runtests/ For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ The list of known issues and fixed bugs for 4.0.5 RC2 is available from here: http://wiki.documentfoundation.org/Releases/4.0.5/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Kurfürstendamm 188, 10707 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint 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-1' - sc/source
sc/source/core/data/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 48cfdaa4fa453af03d18832e3765ffd65a5e107f Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 16:14:31 2013 +0100 Resolves: fdo#68220 wrong index into source table code in master is all very different, so 4-1-* only I think Change-Id: I9277faa462b66a38c7da3ba9a92b0381c67cfe23 Reviewed-on: https://gerrit.libreoffice.org/5515 Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de Tested-by: Kohei Yoshida kohei.yosh...@suse.de diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index b687489..800c200 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1361,7 +1361,7 @@ void ScColumn::CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn rDes } ScBaseCell* pDestCell = -maItems[nSrcRow].pCell-Clone( +maItems[nIndex].pCell-Clone( *rDestCol.pDocument, ScAddress(rDestCol.nCol, nDestRow, rDestCol.nTab)); rDestCol.Insert(nDestRow, pDestCell); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/templateabstractview.hxx|1
sfx2/source/control/templateabstractview.cxx | 45 ---
2 files changed, 22 insertions(+), 24 deletions(-)
New commits:
commit 2e45813b7e5757bc050e121acfe942763b9544ff
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Sun Aug 11 19:35:15 2013 +0200
Refactor TemplateAbstractView to define file exts. in one place
Change-Id: I5d799f51c41d9b4f5a0161cf49e76d9539826d8f
Reviewed-on: https://gerrit.libreoffice.org/5365
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/include/sfx2/templateabstractview.hxx
b/include/sfx2/templateabstractview.hxx
index d101aff..8dd6027 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -53,6 +53,7 @@ public:
virtual bool operator () (const ThumbnailViewItem *pItem);
+static bool isFilteredExtension(FILTER_APPLICATION filter, const OUString
rExt);
bool isValid (const OUString rPath) const;
protected:
diff --git a/sfx2/source/control/templateabstractview.cxx
b/sfx2/source/control/templateabstractview.cxx
index cd6e77f..d911917 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -27,32 +27,36 @@
#include ../doc/doc.hrc
#include templateview.hrc
-bool ViewFilter_Application::isValid (const OUString rPath) const
+bool ViewFilter_Application::isFilteredExtension(FILTER_APPLICATION filter,
const OUString rExt)
{
bool bRet = true;
-INetURLObject aUrl(rPath);
-OUString aExt = aUrl.getExtension();
-if (mApp == FILTER_APP_WRITER)
+if (filter == FILTER_APP_WRITER)
{
-bRet = aExt == ott || aExt == stw || aExt == oth || aExt ==
dot || aExt == dotx;
+bRet = rExt == ott || rExt == stw || rExt == oth || rExt ==
dot || rExt == dotx;
}
-else if (mApp == FILTER_APP_CALC)
+else if (filter == FILTER_APP_CALC)
{
-bRet = aExt == ots || aExt == stc || aExt == xlt || aExt ==
xltm || aExt == xltx;
+bRet = rExt == ots || rExt == stc || rExt == xlt || rExt ==
xltm || rExt == xltx;
}
-else if (mApp == FILTER_APP_IMPRESS)
+else if (filter == FILTER_APP_IMPRESS)
{
-bRet = aExt == otp || aExt == sti || aExt == pot || aExt ==
potm || aExt == potx;
+bRet = rExt == otp || rExt == sti || rExt == pot || rExt ==
potm || rExt == potx;
}
-else if (mApp == FILTER_APP_DRAW)
+else if (filter == FILTER_APP_DRAW)
{
-bRet = aExt == otg || aExt == std;
+bRet = rExt == otg || rExt == std;
}
return bRet;
}
+bool ViewFilter_Application::isValid (const OUString rPath) const
+{
+INetURLObject aUrl(rPath);
+return isFilteredExtension(mApp, aUrl.getExtension());
+}
+
bool ViewFilter_Application::operator () (const ThumbnailViewItem *pItem)
{
const TemplateViewItem *pTempItem = dynamic_castconst
TemplateViewItem*(pItem);
@@ -260,26 +264,19 @@ BitmapEx TemplateAbstractView::scaleImg (const BitmapEx
rImg, long width, long
BitmapEx TemplateAbstractView::getDefaultThumbnail( const OUString rPath )
{
+BitmapEx aImg;
INetURLObject aUrl(rPath);
OUString aExt = aUrl.getExtension();
-BitmapEx aImg;
-if ( aExt == ott || aExt == stw || aExt == oth || aExt == dot ||
aExt == dotx )
-{
+if ( ViewFilter_Application::isFilteredExtension( FILTER_APP_WRITER, aExt)
)
aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_TEXT ) );
-}
-else if ( aExt == ots || aExt == stc || aExt == xlt || aExt ==
xltm || aExt == xltx )
-{
+else if ( ViewFilter_Application::isFilteredExtension( FILTER_APP_CALC,
aExt) )
aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_SHEET ) );
-}
-else if ( aExt == otp || aExt == sti || aExt == pot || aExt ==
potm || aExt == potx )
-{
+else if ( ViewFilter_Application::isFilteredExtension( FILTER_APP_IMPRESS,
aExt) )
aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_PRESENTATION ) );
-}
-else if ( aExt == otg || aExt == std )
-{
+else if ( ViewFilter_Application::isFilteredExtension( FILTER_APP_DRAW,
aExt) )
aImg = BitmapEx ( SfxResId( SFX_THUMBNAIL_DRAWING ) );
-}
+
return aImg;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source cui/source
basctl/source/basicide/baside2b.cxx | 13 -
cui/source/options/optbasic.cxx | 25 +
2 files changed, 21 insertions(+), 17 deletions(-)
New commits:
commit 54704aea436c6dc43a17c8aec5d102cc9652b220
Author: Gergo Mocsi gmocs...@gmail.com
Date: Mon Aug 19 17:28:52 2013 +0200
GSOC work, options fix
Tools/Options are now saving correctly.
I've added a check for empty string in EditorWindow::HandleCodeCompletition.
Change-Id: Ib5d75fe840e3c3fd12cd7175fb7828b8a1d76db6
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 2e06232..7d67327 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -788,11 +788,14 @@ void EditorWindow::HandleCodeCompletition()
OUString sVarType = aCodeCompleteCache.GetVarType( sBaseName );
if( !sVarType.isEmpty() CodeCompleteOptions::IsAutoCorrectOn() )
{//correct variable name, if autocorrection on
-TextPaM aStart(nLine, aLine.indexOf(sBaseName) );
-TextPaM aEnd(nLine, aLine.indexOf(sBaseName) +
sBaseName.getLength() );
-TextSelection sTextSelection(aStart, aEnd);
-pEditEngine-ReplaceText( sTextSelection,
aCodeCompleteCache.GetCorrectCaseVarName(sBaseName, GetActualSubName(nLine)) );
-pEditView-SetSelection( aSel );
+const OUString sStr = aCodeCompleteCache.GetCorrectCaseVarName(
sBaseName, GetActualSubName(nLine) );
+if( !sStr.isEmpty() )
+{
+TextPaM aStart(nLine, aSel.GetStart().GetIndex() -
sStr.getLength() );
+TextSelection sTextSelection(aStart, TextPaM(nLine,
aSel.GetStart().GetIndex()));
+pEditEngine-ReplaceText( sTextSelection, sStr );
+pEditView-SetSelection( aSel );
+}
}
UnoTypeCodeCompletetor aTypeCompletor( aVect, sVarType );
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 21026b3..88ccc6d 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -82,55 +82,56 @@ void SvxBasicIDEOptionsPage::SaveConfig()
sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet /*rCoreSet*/ )
{
sal_Bool bModified = sal_False;
+boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
if( pAutocloseProcChk-IsChecked() != pAutocloseProcChk-GetSavedValue() )
{
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set(
pAutocloseProcChk-IsChecked(), batch );
-batch-commit();
+CodeCompleteOptions::SetProcedureAutoCompleteOn(
pAutocloseProcChk-IsChecked() );
+//batch-commit();
bModified = sal_True;
}
if( pCodeCompleteChk-IsChecked() != pCodeCompleteChk-GetSavedValue() )
{
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
+//boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set(
pCodeCompleteChk-IsChecked(), batch );
-batch-commit();
+CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk-IsChecked()
);
+//batch-commit();
bModified = sal_True;
}
if( pUseExtendedTypesChk-IsChecked() !=
pUseExtendedTypesChk-GetSavedValue() )
{
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::UseExtended::set(
pUseExtendedTypesChk-IsChecked(), batch );
-batch-commit();
+CodeCompleteOptions::SetExtendedTypeDeclaration(
pUseExtendedTypesChk-IsChecked() );
bModified = sal_True;
}
if( pAutocloseParenChk-IsChecked() != pAutocloseParenChk-GetSavedValue()
)
{
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set(
pAutocloseParenChk-IsChecked(), batch );
-batch-commit();
+CodeCompleteOptions::SetAutoCloseParenthesisOn(
pAutocloseParenChk-IsChecked() );
bModified = sal_True;
}
if( pAutocloseQuotesChk-IsChecked() !=
pAutocloseQuotesChk-GetSavedValue() )
{
-boost::shared_ptr comphelper::ConfigurationChanges batch(
comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set(
pAutocloseQuotesChk-IsChecked(), batch );
-batch-commit();
+CodeCompleteOptions::SetAutoCloseQuotesOn(
pAutocloseQuotesChk-IsChecked() );
bModified = sal_True;
}
if(
[Libreoffice-commits] core.git: include/rtl include/unotools sal/rtl sw/source unotools/source
include/rtl/character.hxx | 27 -
include/unotools/charclass.hxx|5 +++-
sal/rtl/strtmpl.cxx | 32 ++
sal/rtl/ustring.cxx | 16 +--
sw/source/core/unocore/XMLRangeHelper.cxx |4 +--
unotools/source/i18n/charclass.cxx| 15 +++---
6 files changed, 53 insertions(+), 46 deletions(-)
New commits:
commit c8e39e66528affb66f1ae121fa36dd4ab31a9b0b
Author: Arnaud Versini arnaud.vers...@libreoffice.org
Date: Sat Aug 10 12:41:03 2013 +0200
Introduce rtl::compareIgnoreCase and deprecate rtl/character.hxx
equivalents.
Change-Id: Id90935fd2b0f904f89477792edc8140cfc31e91f
Reviewed-on: https://gerrit.libreoffice.org/5412
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx
index 0ba86d6..01350e1 100644
--- a/include/rtl/character.hxx
+++ b/include/rtl/character.hxx
@@ -21,8 +21,10 @@
#define INCLUDED_RTL_CHARACTER_HXX
#include sal/config.h
-
#include sal/types.h
+#include sal/log.hxx
+
+#include assert.h
namespace rtl
{
@@ -137,6 +139,29 @@ inline bool isAsciiHexDigit(sal_uInt32 nUtf32)
return isAsciiCanonicHexDigit(nUtf32) || (nUtf32 = 'a' nUtf32 = 'f');
}
+/** Compare two US-ASCII characters.
+
+@param nChar1 A Unicode scalar value (represented as a UTF-32 code unit).
+@param nChar2 A unicode scalar value (represented as a UTF-32 code unit).
+
+@return
+0 if both strings are equal
+ 0 - if this string is less than the string argument
+ 0 - if this string is greater than the string argument
+
+@since LibreOffice 4.2
+ */
+inline sal_Int32 compareAsciiIgnoreCase(sal_uInt32 nChar1, sal_uInt32 nChar2)
+{
+assert(isAscii(nChar1) isAscii(nChar2));
+if ( isAsciiUpperCase(nChar1) )
+nChar1 += 32;
+if ( isAsciiUpperCase(nChar2) )
+nChar2 += 32;
+return nChar1 - nChar2;
+}
+
+
}//rtl namespace
#endif
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 1eb2954a..0522df3 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -16,6 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+
#include unotools/unotoolsdllapi.h
#ifndef _UNOTOOLS_CHARCLASS_HXX
@@ -33,7 +34,6 @@
#include osl/mutex.hxx
#include rtl/character.hxx
-
namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
@@ -93,18 +93,21 @@ public:
/// isdigit() on ascii values
+SAL_DEPRECATED(Use rtl::isAsciiDigit instead)
static inline bool isAsciiDigit( sal_Unicode c )
{
return rtl::isAsciiDigit( c );
}
/// isalpha() on ascii values
+SAL_DEPRECATED(Use rtl::isAsciiAlpha instead)
static inline bool isAsciiAlpha( sal_Unicode c )
{
return rtl::isAsciiAlpha( c );
}
/// isalnum() on ascii values
+SAL_DEPRECATED(Use rtl::isAsciiAlphanumeric instead)
static inline bool isAsciiAlphaNumeric( sal_Unicode c )
{
return rtl::isAsciiAlphanumeric( c );
diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index dc54945..8d759b4 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -27,6 +27,8 @@
#include limits
#include boost/static_assert.hpp
+#include rtl/character.hxx
+
/*
inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
const IMPL_RTL_STRCODE* pSrc,
@@ -170,25 +172,19 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME(
compareIgnoreAsciiCase )( const IMPL_RTL_ST
SAL_THROW_EXTERN_C()
{
sal_Int32 nRet;
-sal_Int32 c1;
-sal_Int32 c2;
do
{
-/* If character between 'A' and 'Z', than convert it to lowercase */
-c1 = (sal_Int32)IMPL_RTL_USTRCODE( *pStr1 );
-c2 = (sal_Int32)IMPL_RTL_USTRCODE( *pStr2 );
-if ( (c1 = 65) (c1 = 90) )
-c1 += 32;
-if ( (c2 = 65) (c2 = 90) )
-c2 += 32;
-nRet = c1-c2;
+nRet = rtl::compareAsciiIgnoreCase(
+(sal_Int32)IMPL_RTL_USTRCODE( *pStr1 ),
+(sal_Int32)IMPL_RTL_USTRCODE( *pStr2 ));
+
if ( nRet != 0 )
return nRet;
pStr1++;
pStr2++;
}
-while ( c2 );
+while ( *pStr2 );
return 0;
}
@@ -204,18 +200,12 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME(
compareIgnoreAsciiCase_WithLength )( const
const IMPL_RTL_STRCODE* pStr1End = pStr1 + nStr1Len;
const IMPL_RTL_STRCODE* pStr2End = pStr2 + nStr2Len;
sal_Int32 nRet;
-sal_Int32 c1;
-sal_Int32 c2;
while ( (pStr1 pStr1End) (pStr2 pStr2End) )
{
-/* If character between 'A' and 'Z', than convert it to lowercase */
-c1 =
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/core/RDFaExportHelper.cxx |6 +-
xmloff/source/core/nmspmap.cxx | 10 --
xmloff/source/draw/animationexport.cxx |4 +---
xmloff/source/draw/shapeexport2.cxx |6 +-
xmloff/source/draw/shapeexport4.cxx |4 +---
xmloff/source/forms/propertyexport.cxx |4 +---
xmloff/source/style/xmlbahdl.cxx|8 +---
xmloff/source/style/xmlexppr.cxx|8 ++--
xmloff/source/style/xmlnumfi.cxx| 11 +++
xmloff/source/text/txtprhdl.cxx | 14 ++
xmloff/source/transform/TransformerBase.cxx |5 +
xmloff/source/xforms/xformsexport.cxx |8 +++-
12 files changed, 21 insertions(+), 67 deletions(-)
New commits:
commit fa0e48c5e4ffc2bf05a60ce0e878073643db8cbe
Author: Jelle van der Waa je...@vdwaa.nl
Date: Fri Aug 9 17:07:04 2013 +0200
fdo#57950: Remove some chained appends in xmloff
Change-Id: Iff0c43d190e6afa26c23416db4da9843cf7f41a5
Reviewed-on: https://gerrit.libreoffice.org/5327
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/xmloff/source/core/RDFaExportHelper.cxx
b/xmloff/source/core/RDFaExportHelper.cxx
index d2b830f..29047f8 100644
--- a/xmloff/source/core/RDFaExportHelper.cxx
+++ b/xmloff/source/core/RDFaExportHelper.cxx
@@ -151,13 +151,9 @@ RDFaExportHelper::AddRDFa(
{
throw uno::RuntimeException();
}
-static const sal_Unicode s_OpenBracket ('[');
-static const sal_Unicode s_CloseBracket(']');
const OUString about( xSubjectURI.is()
? getRelativeReference(m_rExport, xSubjectURI-getStringValue())
-: OUStringBuffer().append(s_OpenBracket).append(
-LookupBlankNode(xSubjectBNode)).append(s_CloseBracket)
-.makeStringAndClear()
+: [ + LookupBlankNode(xSubjectBNode) + ]
);
const uno::Referencerdf::XLiteral xContent(
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 03e5e13..44eb235 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -548,13 +548,11 @@ sal_Bool SvXMLNamespaceMap::NormalizeOasisURN( OUString
rName )
return sal_False;
// replace [tcid] with current TCID and version with current version.
-OUStringBuffer aNewName( nNameLen +20 );
-aNewName.append( rName.copy( 0, nTCIdStart ) );
-aNewName.append( GetXMLToken( XML_OPENDOCUMENT ) );
-aNewName.append( rName.copy( nTCIdEnd, nVersionStart-nTCIdEnd ) );
-aNewName.append( GetXMLToken( XML_1_0 ) );
-rName = aNewName.makeStringAndClear();
+rName = rName.copy( 0, nTCIdStart ) +
+GetXMLToken( XML_OPENDOCUMENT ) +
+rName.copy( nTCIdEnd, nVersionStart-nTCIdEnd ) +
+GetXMLToken( XML_1_0 );
return sal_True;
}
diff --git a/xmloff/source/draw/animationexport.cxx
b/xmloff/source/draw/animationexport.cxx
index 14a63c3..3ccb7e1 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -1247,9 +1247,7 @@ void AnimationsExporterImpl::exportAnimate( const
Reference XAnimate xAnimat
if( !sTmp.isEmpty() )
sTmp.append( (sal_Unicode)';' );
-sTmp.append( p-Time );
-sTmp.append( (sal_Unicode)',' );
-sTmp.append( p-Progress );
+sTmp.append( OUString::number(p-Time) + , +
OUString::number(p-Progress) );
p++;
}
diff --git a/xmloff/source/draw/shapeexport2.cxx
b/xmloff/source/draw/shapeexport2.cxx
index f907121..70593e6 100644
--- a/xmloff/source/draw/shapeexport2.cxx
+++ b/xmloff/source/draw/shapeexport2.cxx
@@ -500,12 +500,8 @@ void XMLShapeExport::ImpExportEvents( const
uno::Reference drawing::XShape x
(aStrLibrary.equalsIgnoreAsciiCase(StarOffice) ||
aStrLibrary.equalsIgnoreAsciiCase(application) ) ?
XML_APPLICATION
:
XML_DOCUMENT ) );
-OUStringBuffer sTmp( sLocation.getLength() +
aStrMacro.getLength() + 1 );
-sTmp = sLocation;
-sTmp.append( sal_Unicode( ':' ) );
-sTmp.append( aStrMacro );
mrExport.AddAttribute(XML_NAMESPACE_SCRIPT, XML_MACRO_NAME,
- sTmp.makeStringAndClear());
+sLocation + : + aStrMacro);
}
else
{
diff --git a/xmloff/source/draw/shapeexport4.cxx
b/xmloff/source/draw/shapeexport4.cxx
index a87f73f..111f015 100644
--- a/xmloff/source/draw/shapeexport4.cxx
+++ b/xmloff/source/draw/shapeexport4.cxx
@@ -92,9 +92,7 @@ void ExportParameter( OUStringBuffer rStrBuffer, const
com::sun::star::drawing:
[Libreoffice-commits] core.git: sw/source
sw/source/core/access/accpara.cxx | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit cc0dd9f8bd4ee52e5a26c0630e7960386aeffb15
Author: Boris Dušek m...@dusek.me
Date: Sat Aug 17 17:23:40 2013 +0200
fdo#68219: Parent style text attributes missing in accessibility
Thanks to Niklas Johansson for testing.
Change-Id: I550076e7d62f8db389cdbf902fce0ff7f8f98165
Reviewed-on: https://gerrit.libreoffice.org/5480
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index c97d162..f9afed9 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1197,6 +1197,14 @@ uno::SequencePropertyValue
SwAccessibleParagraph::getCharacterAttributes(
return aValues;
}
+static void SetPutRecursive(SfxItemSet targetSet, const SfxItemSet sourceSet)
+{
+const SfxItemSet *const pParentSet = sourceSet.GetParent();
+if (pParentSet)
+SetPutRecursive(targetSet, *pParentSet);
+targetSet.Put(sourceSet);
+}
+
// #i63870#
void SwAccessibleParagraph::_getDefaultAttributesImpl(
const uno::Sequence OUString aRequestedAttributes,
@@ -1243,7 +1251,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
SfxItemSet aCharSet(
const_castSwAttrPool(pTxtNode-GetDoc()-GetAttrPool()),
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
0 );
-aCharSet.Put( pTxtNode-GetTxtColl()-GetAttrSet() );
+SetPutRecursive( aCharSet, pTxtNode-GetTxtColl()-GetAttrSet() );
pSet-Put( aCharSet );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Remove com.sun.star.comp.stoc.RegistryTypeDescriptionProvide...
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/5514 to look at the new patch set (#2). Change subject: Remove com.sun.star.comp.stoc.RegistryTypeDescriptionProvider .. Remove com.sun.star.comp.stoc.RegistryTypeDescriptionProvider ...which had become unused with the new cppuhelper/source/typemanager.cxx. Change-Id: Ic84d11cc9ecd1e7d73aa2757c14ffd46fa21e890 --- M stoc/Library_bootstrap.mk M stoc/inc/bootstrapservices.hxx M stoc/source/bootstrap/services.cxx D stoc/source/registry_tdprovider/base.hxx D stoc/source/registry_tdprovider/functiondescription.cxx D stoc/source/registry_tdprovider/functiondescription.hxx D stoc/source/registry_tdprovider/methoddescription.cxx D stoc/source/registry_tdprovider/methoddescription.hxx D stoc/source/registry_tdprovider/rdbtdp_tdenumeration.cxx D stoc/source/registry_tdprovider/rdbtdp_tdenumeration.hxx D stoc/source/registry_tdprovider/structtypedescription.cxx D stoc/source/registry_tdprovider/structtypedescription.hxx D stoc/source/registry_tdprovider/td.cxx D stoc/source/registry_tdprovider/tdcomp.cxx D stoc/source/registry_tdprovider/tdconsts.cxx D stoc/source/registry_tdprovider/tdef.cxx D stoc/source/registry_tdprovider/tdenum.cxx D stoc/source/registry_tdprovider/tdiface.cxx D stoc/source/registry_tdprovider/tdmodule.cxx D stoc/source/registry_tdprovider/tdprop.cxx D stoc/source/registry_tdprovider/tdprovider.cxx D stoc/source/registry_tdprovider/tdservice.cxx D stoc/source/registry_tdprovider/tdsingleton.cxx M stoc/util/bootstrap.component 24 files changed, 0 insertions(+), 4,504 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/14/5514/2 -- To view, visit https://gerrit.libreoffice.org/5514 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic84d11cc9ecd1e7d73aa2757c14ffd46fa21e890 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remove com.sun.star.comp.stoc.RegistryTypeDescriptionProvide...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5514 -- To view, visit https://gerrit.libreoffice.org/5514 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic84d11cc9ecd1e7d73aa2757c14ffd46fa21e890 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/externalrefmgr.cxx | 27 ++-
1 file changed, 18 insertions(+), 9 deletions(-)
New commits:
commit f243d07019ca205ef536b0d7b0e1fe4b84469f75
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Aug 16 16:29:14 2013 +0200
sc/externalrefmgr: reduce individual cell queries
Change-Id: Ic0dda47f02cd392234876a8945e240bbc915fa6a
Reviewed-on: https://gerrit.libreoffice.org/5453
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 8ab55db..f27f258 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -764,21 +764,30 @@ void ScExternalRefCache::setCellRangeData(sal_uInt16
nFileId, const ScRange rRa
if (!pTabData.get())
pTabData.reset(new Table);
+const ScMatrixRef pMat = itrData-mpRangeData;
for (SCROW nRow = nRow1; nRow = nRow2; ++nRow)
{
+const SCSIZE nR = nRow - nRow1;
for (SCCOL nCol = nCol1; nCol = nCol2; ++nCol)
{
-SCSIZE nC = nCol - nCol1, nR = nRow - nRow1;
+const SCSIZE nC = nCol - nCol1;
+
+ScMatrixValue value = pMat-Get(nC, nR);
+
TokenRef pToken;
-const ScMatrixRef pMat = itrData-mpRangeData;
-if (pMat-IsEmpty(nC, nR))
-// Don't cache empty cells.
-continue;
-if (pMat-IsValue(nC, nR))
-pToken.reset(new
formula::FormulaDoubleToken(pMat-GetDouble(nC, nR)));
-else if (pMat-IsString(nC, nR))
-pToken.reset(new
formula::FormulaStringToken(pMat-GetString(nC, nR)));
+switch (value.nType) {
+case SC_MATVAL_VALUE:
+case SC_MATVAL_BOOLEAN:
+pToken.reset(new
formula::FormulaDoubleToken(value.fVal));
+break;
+case SC_MATVAL_STRING:
+pToken.reset(new
formula::FormulaStringToken(value.aStr));
+break;
+default:
+// Don't cache empty cells.
+break;
+}
if (pToken)
// Don't mark this cell 'cached' here, for better
performance.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/externalrefmgr.cxx | 81 +++
1 file changed, 73 insertions(+), 8 deletions(-)
New commits:
commit e5d9477e87837fb771cf6dcb3bde872873bc50a8
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Fri Aug 16 16:28:54 2013 +0200
sc/externalrefmgr: batch same-type cells copy
Change-Id: I5726261c9fbe479e2b5be6862324d23a30d4ab40
Reviewed-on: https://gerrit.libreoffice.org/5452
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx
b/sc/source/ui/docshell/externalrefmgr.cxx
index 9c40b8e..8ab55db 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1301,6 +1301,68 @@ static FormulaToken* convertToToken( ScRefCellValue
rCell )
return NULL;
}
+templateclass T
+struct ColumnBatch
+{
+std::vectorT maStorage;
+CellType meType1;
+CellType meType2;
+SCROW mnRowStart;
+
+ColumnBatch(CellType eType1, CellType eType2) :
+meType1(eType1), meType2(eType2), mnRowStart(-1) {}
+
+void update(ScRefCellValue raCell, const SCCOL nCol, const SCROW nRow,
ScMatrixRef xMat)
+{
+if (raCell.meType == meType1 || raCell.meType == meType2)
+{
+if (mnRowStart 0)
+mnRowStart = nRow;
+maStorage.push_back(getValue(raCell));
+}
+else
+{
+flush(nCol, xMat);
+}
+}
+
+void flush(const SCCOL nCol, ScMatrixRef xMat)
+{
+if (maStorage.empty())
+return;
+putValues(xMat, nCol);
+mnRowStart = -1;
+maStorage.clear();
+}
+
+T getValue(ScRefCellValue raCell) const;
+void putValues(ScMatrixRef xMat, const SCCOL nCol) const;
+};
+
+template
+inline OUString ColumnBatchOUString::getValue(ScRefCellValue raCell) const
+{
+return raCell.getString(NULL);
+}
+
+templateclass T
+inline T ColumnBatchT::getValue(ScRefCellValue raCell) const
+{
+return raCell.mfValue;
+}
+
+template
+inline void ColumnBatchOUString::putValues(ScMatrixRef xMat, const SCCOL
nCol) const
+{
+xMat-PutString(maStorage.data(), maStorage.size(), nCol, mnRowStart);
+}
+
+templateclass T
+inline void ColumnBatchT::putValues(ScMatrixRef xMat, const SCCOL nCol)
const
+{
+xMat-PutDouble(maStorage.data(), maStorage.size(), nCol, mnRowStart);
+}
+
static ScTokenArray* convertToTokenArray(
ScDocument* pSrcDoc, ScRange rRange,
vectorScExternalRefCache::SingleRangeData rCacheData )
{
@@ -1348,27 +1410,27 @@ static ScTokenArray* convertToTokenArray(
static_castSCSIZE(nCol2-nCol1+1),
static_castSCSIZE(nRow2-nRow1+1));
ScRefCellValue aCell;
+ColumnBatchOUString stringBatch(CELLTYPE_STRING, CELLTYPE_EDIT);
+ColumnBatchdouble doubleBatch(CELLTYPE_VALUE, CELLTYPE_VALUE);
+
for (SCCOL nCol = nDataCol1; nCol = nDataCol2; ++nCol)
{
+const SCSIZE nC = nCol - nCol1;
for (SCROW nRow = nDataRow1; nRow = nDataRow2; ++nRow)
{
-SCSIZE nC = nCol - nCol1, nR = nRow - nRow1;
+const SCSIZE nR = nRow - nRow1;
aCell.assign(*pSrcDoc, ScAddress(nCol, nRow, nTab));
+stringBatch.update(aCell, nC, nR, xMat);
+doubleBatch.update(aCell, nC, nR, xMat);
+
if (aCell.hasEmptyValue())
// Skip empty cells. Matrix's default values are empty
elements.
continue;
switch (aCell.meType)
{
-case CELLTYPE_EDIT:
-case CELLTYPE_STRING:
-xMat-PutString(aCell.getString(NULL), nC, nR);
-break;
-case CELLTYPE_VALUE:
-xMat-PutDouble(aCell.mfValue, nC, nR);
-break;
case CELLTYPE_FORMULA:
{
ScFormulaCell* pFCell = aCell.mpFormula;
@@ -1391,6 +1453,9 @@ static ScTokenArray* convertToTokenArray(
OSL_FAIL(attempted to convert an unknown cell type.);
}
}
+
+stringBatch.flush(nC, xMat);
+doubleBatch.flush(nC, xMat);
}
if (!bFirstTab)
pArray-AddOpCode(ocSep);
___
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' - sd/source
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 6ce6b25ef4fbca3dae71b40e07176b0eeb8e1ca7
Author: Michael Meeks michael.me...@suse.com
Date: Sat Aug 3 13:35:19 2013 +0200
fdo#67707 - avoid crash with sidebar when switching to writer from impress.
Change-Id: I0010663951fe67bfb864ffdaecb251b3da5a3ac3
(cherry picked from commit 457bc1ebdf327685fcf2ccac8d6c87c839c43200)
Reviewed-on: https://gerrit.libreoffice.org/5516
Tested-by: Michael Meeks michael.me...@suse.com
Reviewed-by: Michael Meeks michael.me...@suse.com
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index ca0ff0b..c1b1e1a 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include controller/SlsSelectionFunction.hxx
#include SlideSorter.hxx
@@ -439,7 +438,7 @@ sal_Bool SelectionFunction::KeyInput (const KeyEvent
rEvent)
mpModeHandler-SetCurrentPage(pDescriptor);
mpModeHandler-SwitchView(pDescriptor);
}
-else
+else if (pViewShell-GetDispatcher() != NULL)
{
pViewShell-GetDispatcher()-Execute(
SID_INSERTPAGE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67707, which changed state. Bug 67707 Summary: crash processing keystroke with sidebar open https://bugs.freedesktop.org/show_bug.cgi?id=67707 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on|46410 | -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 tommy27 ba...@quipo.it changed: What|Removed |Added Depends on||46410 -- 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
Re: a lot of warnings when running calc
Hi, On Monday, 2013-08-19 08:49:36 -0400, Kohei Yoshida wrote: On 08/19/2013 05:22 AM, Winfried Donkers wrote: Is this a 'harmless' warning? No idea, since I don't know the original intent of this warning. Do you happen to know the intent of this warning, Eike? Yes :) nFormulaCodeInTree keeps track of the number of tokens inserted with formula cells to the recalculation chain; if in ScDocument::RemoveFromFormulaTree() the number is less than the number of tokens in the actual cell being removed it means that some formula or its RPN changed after a cell was added. This indicates that it wasn't removed before the change and re-added after the change. In itself it doesn't harm because the value is only used as an indicator for the progress bar during calculations, but that then displays wrongly and may not invoke a reschedule anymore. The count may be wrong now because recompilation/recalcutation is deferred due to the display of cached values after load and formulas are (re)compiled later. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A For key transition see http://erack.de/key-transition-2013-01-10.txt.asc Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpUhwFmNOvMG.pgp Description: PGP signature ___ 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 Bug 60270 depends on bug 67221, which changed state. Bug 67221 Summary: [FILESAVE] Saving xls file which has cell with formula result #DIV/0! deleted formula, data loss https://bugs.freedesktop.org/show_bug.cgi?id=67221 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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: chart2/source
chart2/source/tools/XMLRangeHelper.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bd9c1714eda37bbbd43f22bfb71a7c4304d40630
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Aug 19 19:49:59 2013 +0200
Fix deprecated: use rtl::isAsciiDigit/isAsciiAlpha instead
Change-Id: I74238c164e661f0090e78e5c6107b974834a685b
diff --git a/chart2/source/tools/XMLRangeHelper.cxx
b/chart2/source/tools/XMLRangeHelper.cxx
index 1f11eed..227b3e0c 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -117,7 +117,7 @@ void lcl_getSingleCellAddressFromXMLString(
sal_Int32 i = nLength - 1, nColumn = 0;
// parse number for row
-while( CharClass::isAsciiDigit( pStrArray[ i ] ) i = 0 )
+while( rtl::isAsciiDigit( pStrArray[ i ] ) i = 0 )
i--;
rOutCell.nRow = (aCellStr.copy( i + 1 )).toInt32() - 1;
// a dollar in XML means absolute (whereas in UI it means relative)
@@ -131,7 +131,7 @@ void lcl_getSingleCellAddressFromXMLString(
// parse rest for column
sal_Int32 nPower = 1;
-while( CharClass::isAsciiAlpha( pStrArray[ i ] ))
+while( rtl::isAsciiAlpha( pStrArray[ i ] ))
{
nColumn += (pStrArray[ i ] - aLetterA + 1) * nPower;
i--;
___
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-1' - extensions/source
extensions/source/propctrlr/stringrepresentation.cxx | 25 ++-
1 file changed, 24 insertions(+), 1 deletion(-)
New commits:
commit 6c17704810cbd8b937abaa915ef89c89337f713d
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Aug 19 14:10:41 2013 +0200
fdo#67109: Order of XConstantsTypeDescription.getConstants is unspecified
...it looks like it used to be the order the constants appeared in the .idl
file, while now it happens to be the lexicographical order of the constant's
names. For all the constant groups in com.sun.star.report the order
expected by
the code appears to be the order of the constant's numeric values (which
happens
to coincide with the order of appearance in the .idl files), so explicitly
sort
them that way.
Change-Id: I550401b2742fffb7c96a7787498967a7cd78fff8
(cherry picked from commit def066bb6559e8c77eeb924db1356f9848f5c8a2)
Reviewed-on: https://gerrit.libreoffice.org/5513
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/extensions/source/propctrlr/stringrepresentation.cxx
b/extensions/source/propctrlr/stringrepresentation.cxx
index a68c8d0..4c8d4aa 100644
--- a/extensions/source/propctrlr/stringrepresentation.cxx
+++ b/extensions/source/propctrlr/stringrepresentation.cxx
@@ -32,6 +32,7 @@
#include com/sun/star/util/Date.hpp
#include com/sun/star/util/Time.hpp
#include comphelper/sequence.hxx
+#include comphelper/sequenceasvector.hxx
#include connectivity/dbconversion.hxx
#include formresid.hrc
#include tools/debug.hxx
@@ -223,6 +224,24 @@ uno::Any SAL_CALL
StringRepresentation::convertToPropertyValue(const OUString
return aReturn;
}
+namespace {
+
+// This comparison functor assumes an underlying set of constants with pairwise
+// unequal values that are all of UNO SHORT or LONG type:
+struct CompareConstants {
+bool operator ()(
+css::uno::Reference css::reflection::XConstantTypeDescription const
+c1,
+css::uno::Reference css::reflection::XConstantTypeDescription const
+c2) const
+{
+return c1-getConstantValue().getsal_Int32()
+ c2-getConstantValue().getsal_Int32();
+}
+};
+
+}
+
// lang::XInitialization:
void SAL_CALL StringRepresentation::initialize(const uno::Sequence uno::Any
aArguments) throw (uno::RuntimeException, uno::Exception)
{
@@ -244,7 +263,11 @@ void SAL_CALL StringRepresentation::initialize(const
uno::Sequence uno::Any
uno::UNO_QUERY_THROW );
m_xTypeDescription.set( xTypeDescProv-getByHierarchicalName(
sConstantName ), uno::UNO_QUERY_THROW );
-m_aConstants = m_xTypeDescription-getConstants();
+comphelper::SequenceAsVector
+uno::Reference reflection::XConstantTypeDescription
+cs(m_xTypeDescription-getConstants());
+std::sort(cs.begin(), cs.end(), CompareConstants());
+cs m_aConstants;
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Mikeyy mikeyy@gmail.com changed: What|Removed |Added Depends on||66506 --- Comment #73 from Mikeyy mikeyy@gmail.com --- I would like to nominate bug 66506. This bug is half fixed, for XLS files, but it's still not fixed for ODS files. It's an regression introduced in 4.1. I'm adding it here to keep it on dev radar. If you don't think it should be here please delete it. -- 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: Branch 'libreoffice-4-1-1' - include/svx svx/source
include/svx/ctredlin.hxx |6 ++
svx/source/dialog/ctredlin.cxx | 20 +++-
2 files changed, 21 insertions(+), 5 deletions(-)
New commits:
commit af76d0d6645a15447139bcb1fac1ec32033441a5
Author: Caolán McNamara caol...@redhat.com
Date: Sun Aug 18 14:16:10 2013 +0100
don't unconditionally enable buttons on switching to accept/reject page
we want to disable all of them when switch to the options page and *restore*
the original enable/disable state when switching back i.e. don't enable
them if
they were disabled due to change tracking password protection
regression since 8655095a4910ca795dfd182e6796d9375727a694
Change-Id: I2dd6c83fd9613adf42571684a08bff81b86c9ee1
(cherry picked from commit 30ba8fa46aafb0868ada3b0092cd33524c145989)
Reviewed-on: https://gerrit.libreoffice.org/5502
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit c373d4a7807581459a474ffc0a277d0d6c00447a)
Reviewed-on: https://gerrit.libreoffice.org/5508
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index c88b742..e8cb58b 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -311,6 +311,12 @@ private:
PushButton* m_pRejectAll;
PushButton* m_pUndo;
+bool bEnableAccept;
+bool bEnableAcceptAll;
+bool bEnableReject;
+bool bEnableRejectAll;
+bool bEnableUndo;
+
DECL_LINK( PbClickHdl, PushButton* );
public:
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index b201d8d..fcd153d 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -476,6 +476,11 @@ void SvxRedlinTable::InitEntry(SvTreeListEntry* pEntry,
const OUString rStr,
SvxTPView::SvxTPView(Window * pParent)
: TabPage(pParent, RedlineViewPage, svx/ui/redlineviewpage.ui)
+, bEnableAccept(true)
+, bEnableAcceptAll(true)
+, bEnableReject(true)
+, bEnableRejectAll(true)
+, bEnableUndo(true)
{
Dialog *pTopLevel = GetParentDialog();
pTopLevel-get(m_pAccept, accept);
@@ -504,11 +509,11 @@ SvxTPView::SvxTPView(Window * pParent)
void SvxTPView::ActivatePage()
{
-m_pAccept-Enable();
-m_pReject-Enable();
-m_pAcceptAll-Enable();
-m_pRejectAll-Enable();
-m_pUndo-Enable();
+m_pAccept-Enable(bEnableAccept);
+m_pReject-Enable(bEnableReject);
+m_pAcceptAll-Enable(bEnableAcceptAll);
+m_pRejectAll-Enable(bEnableRejectAll);
+m_pUndo-Enable(bEnableUndo);
TabPage::ActivatePage();
}
@@ -559,21 +564,25 @@ void SvxTPView::InsertCalcHeader()
void SvxTPView::EnableAccept(sal_Bool nFlag)
{
+bEnableAccept = nFlag;
m_pAccept-Enable(nFlag);
}
void SvxTPView::EnableAcceptAll(sal_Bool nFlag)
{
+bEnableAcceptAll = nFlag;
m_pAcceptAll-Enable(nFlag);
}
void SvxTPView::EnableReject(sal_Bool nFlag)
{
+bEnableReject = nFlag;
m_pReject-Enable(nFlag);
}
void SvxTPView::EnableRejectAll(sal_Bool nFlag)
{
+bEnableRejectAll = nFlag;
m_pRejectAll-Enable(nFlag);
}
@@ -584,6 +593,7 @@ void SvxTPView::ShowUndo(sal_Bool nFlag)
void SvxTPView::EnableUndo(sal_Bool nFlag)
{
+bEnableUndo = nFlag;
m_pUndo-Enable(nFlag);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/address.cxx | 24
sc/source/core/tool/compiler.cxx |4 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit c7c0510a6c86939e41966aa39eae676a03e6872d
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Aug 19 20:21:41 2013 +0200
Fix deprecated: use rtl::isAsciiDigit/isAsciiAlpha instead (part2)
Change-Id: If7aa24718c3a4bc1656277f0bb741b41fcaf6f4f
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 33c653e..6906c87 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -107,7 +107,7 @@ sal_Unicode_strtol ( const sal_Unicode* p,
else if( *p == '+' )
p++;
-while (CharClass::isAsciiDigit( *p ))
+while (rtl::isAsciiDigit( *p ))
{
accum = accum * 10 + *p - '0';
if( accum prev )
@@ -289,7 +289,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
while( 1 )
{
const sal_Unicode uc = *p;
-if( CharClass::isAsciiAlpha( uc ) || uc == '_' )
+if( rtl::isAsciiAlpha( uc ) || uc == '_' )
{
if( only_digits p != start
(uc == 'e' || uc == 'E' ) )
@@ -300,7 +300,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start,
only_digits = false;
p++;
}
-else if( CharClass::isAsciiDigit( uc ))
+else if( rtl::isAsciiDigit( uc ))
{
p++;
}
@@ -808,13 +808,13 @@ lcl_a1_get_col( const sal_Unicode* p, ScAddress* pAddr,
sal_uInt16* nFlags )
if( *p == '$' )
*nFlags |= SCA_COL_ABSOLUTE, p++;
-if( !CharClass::isAsciiAlpha( *p ) )
+if( !rtl::isAsciiAlpha( *p ) )
return NULL;
nCol = sal::static_int_castSCCOL( toupper( char(*p++) ) - 'A' );
-while (nCol = MAXCOL CharClass::isAsciiAlpha(*p))
+while (nCol = MAXCOL rtl::isAsciiAlpha(*p))
nCol = sal::static_int_castSCCOL( ((nCol + 1) * 26) + toupper(
char(*p++) ) - 'A' );
-if( nCol MAXCOL || CharClass::isAsciiAlpha( *p ) )
+if( nCol MAXCOL || rtl::isAsciiAlpha( *p ) )
return NULL;
*nFlags |= SCA_VALID_COL;
@@ -1089,16 +1089,16 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p,
ScDocument* pDoc, ScAddress rAdd
if (*p == '$')
nBits |= SCA_COL_ABSOLUTE, p++;
-if (CharClass::isAsciiAlpha( *p ))
+if (rtl::isAsciiAlpha( *p ))
{
nCol = sal::static_int_castSCCOL( toupper( char(*p++) ) - 'A' );
-while (nCol MAXCOL CharClass::isAsciiAlpha(*p))
+while (nCol MAXCOL rtl::isAsciiAlpha(*p))
nCol = sal::static_int_castSCCOL( ((nCol + 1) * 26) +
toupper( char(*p++) ) - 'A' );
}
else
nBits = 0;
-if( nCol MAXCOL || CharClass::isAsciiAlpha( *p ) )
+if( nCol MAXCOL || rtl::isAsciiAlpha( *p ) )
nBits = 0;
nRes |= nBits;
if( !nBits )
@@ -,7 +,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p,
ScDocument* pDoc, ScAddress rAdd
nBits = SCA_VALID_ROW;
if (*p == '$')
nBits |= SCA_ROW_ABSOLUTE, p++;
-if( !CharClass::isAsciiDigit( *p ) )
+if( !rtl::isAsciiDigit( *p ) )
{
nBits = 0;
nRow = SCROW(-1);
@@ -1120,7 +1120,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p,
ScDocument* pDoc, ScAddress rAdd
{
OUString aTmp( p );
long n = aTmp.toInt32() - 1;
-while (CharClass::isAsciiDigit( *p ))
+while (rtl::isAsciiDigit( *p ))
p++;
if( n 0 || n MAXROW )
nBits = 0;
@@ -2090,7 +2090,7 @@ bool AlphaToCol( SCCOL rCol, const String rStr)
xub_StrLen nPos = 0;
sal_Unicode c;
while (nResult = MAXCOL nPos nStop (c = rStr.GetChar( nPos)) != 0
-CharClass::isAsciiAlpha(c))
+rtl::isAsciiAlpha(c))
{
if (nPos 0)
nResult = (nResult + 1) * 26;
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 547daa6..62d4178 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3548,8 +3548,8 @@ bool ScCompiler::NextNewToken( bool bInArray )
bool bAsciiNonAlnum;// operators, separators, ...
if ( cSymbol[0] 128 )
{
-bMayBeFuncName = CharClass::isAsciiAlpha( cSymbol[0] );
-bAsciiNonAlnum = !bMayBeFuncName !CharClass::isAsciiDigit(
cSymbol[0] );
+bMayBeFuncName = rtl::isAsciiAlpha( cSymbol[0] );
+bAsciiNonAlnum = !bMayBeFuncName !rtl::isAsciiDigit( cSymbol[0] );
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac | 16 1 file changed, 8 insertions(+), 8 deletions(-) New commits: commit 73ab2af184a10590188b81f188800b42c4991331 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 19 20:43:31 2013 +0300 fdo#68261: 'program' is a symlink, need to use the real name 'MacOS' The installset structure in a traditional (non-Mac-like) OS X was messed up with *both* 'MacOS' and 'program' as real subfolders in instdir. Change-Id: I337e1669d28c6c59993790fd33c9c5ab372c421c diff --git a/configure.ac b/configure.ac index eb08245..46fd086 100644 --- a/configure.ac +++ b/configure.ac @@ -2874,17 +2874,17 @@ if test $_os = Darwin -a $enable_canonical_installation_tree_structure = yes; ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE) elif test $_os = Darwin; then -LIBO_BIN_FOLDER=program -LIBO_ETC_FOLDER=program -LIBO_LIBEXEC_FOLDER=program -LIBO_LIB_FOLDER=program -LIBO_LIB_PYUNO_FOLDER=program +LIBO_BIN_FOLDER=MacOS +LIBO_ETC_FOLDER=MacOS +LIBO_LIBEXEC_FOLDER=MacOS +LIBO_LIB_FOLDER=MacOS +LIBO_LIB_PYUNO_FOLDER=MacOS LIBO_SHARE_FOLDER=share LIBO_SHARE_HELP_FOLDER=help -LIBO_SHARE_JAVA_FOLDER=program/classes +LIBO_SHARE_JAVA_FOLDER=MacOS/classes LIBO_SHARE_PRESETS_FOLDER=presets -LIBO_SHARE_RESOURCE_FOLDER=program/resource -LIBO_SHARE_SHELL_FOLDER=program/shell +LIBO_SHARE_RESOURCE_FOLDER=MacOS/resource +LIBO_SHARE_SHELL_FOLDER=MacOS/shell LIBO_URE_BIN_FOLDER=ure-link/bin LIBO_URE_ETC_FOLDER=ure-link/bin LIBO_URE_LIB_FOLDER=ure-link/lib ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - configure.ac harfbuzz/Module_harfbuzz.mk
configure.ac|2 +- harfbuzz/Module_harfbuzz.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 86b9f81c80ebfa1da77982232ee00572249b4803 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 19 21:59:21 2013 +0300 Test ENABLE_HARFBUZZ, too Change-Id: I3e2ce690fcfd84d91979e737a1977f61319e2a55 diff --git a/harfbuzz/Module_harfbuzz.mk b/harfbuzz/Module_harfbuzz.mk index 8eb9c17..7efb5d4 100644 --- a/harfbuzz/Module_harfbuzz.mk +++ b/harfbuzz/Module_harfbuzz.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,harfbuzz)) -ifeq ($(SYSTEM_HARFBUZZ),NO) +ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),YES-NO) $(eval $(call gb_Module_add_targets,harfbuzz,\ ExternalPackage_harfbuzz \ commit 3640aa3ac516aa66019950ea3771df82248dd557 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 19 21:58:56 2013 +0300 We hardly want harfbuzz on iOS if we don't want it on Darwin Change-Id: I38ce976e55e9800971dcd300902578e06540f358 diff --git a/configure.ac b/configure.ac index 46fd086..d593de8 100644 --- a/configure.ac +++ b/configure.ac @@ -8907,7 +8907,7 @@ dnl === dnl HarfBuzz dnl === AC_MSG_CHECKING([whether to enable HarfBuzz support]) -if test $_os != WINNT -a $_os != Darwin; then +if test $_os != WINNT -a $_os != Darwin -a $_os != iOS; then AC_MSG_RESULT([yes]) ENABLE_HARFBUZZ=TRUE libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu = 0.9.18]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: harfbuzz/Module_harfbuzz.mk
harfbuzz/Module_harfbuzz.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 053b21badc3236aa52de360df2751bcd65d936b6 Author: Tor Lillqvist t...@iki.fi Date: Mon Aug 19 22:06:53 2013 +0300 Er, ENABLE_HARFBUZZ is TRUE, not YES (or empty) Change-Id: If6007b1d9aa2173fc0f508bb6e9b617a440c940c diff --git a/harfbuzz/Module_harfbuzz.mk b/harfbuzz/Module_harfbuzz.mk index 7efb5d4..d3e693f 100644 --- a/harfbuzz/Module_harfbuzz.mk +++ b/harfbuzz/Module_harfbuzz.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,harfbuzz)) -ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),YES-NO) +ifeq ($(ENABLE_HARFBUZZ)-$(SYSTEM_HARFBUZZ),TRUE-NO) $(eval $(call gb_Module_add_targets,harfbuzz,\ ExternalPackage_harfbuzz \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/parse.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4053a7633f58899c999f3dfcfe5a5cf3c5e6cc7f
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Aug 19 21:15:33 2013 +0200
Fix deprecated: use rtl::isAsciiDigit/isAsciiAlpha instead (part3)
Change-Id: I0972f1f46ca46c6c482e016e6e0a280c205cc121
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 169ce5f..8cdd5d7 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -900,7 +900,7 @@ void SmParser::NextToken()
{
cChar = m_aBufferString.GetChar( ++m_nBufferIndex
);
}
-while ( cChar == '.' || CharClass::isAsciiDigit( cChar
) );
+while ( cChar == '.' || rtl::isAsciiDigit( cChar ) );
m_aCurToken.aText = m_aBufferString.Copy(
sal::static_int_cast xub_StrLen (nTxtStart),
sal::static_int_cast xub_StrLen (m_nBufferIndex - nTxtStart) );
@@ -1963,7 +1963,7 @@ static bool lcl_IsNumber(const OUString rText)
else
bPoint = true;
}
-else if ( !CharClass::isAsciiDigit( cChar ) )
+else if ( !rtl::isAsciiDigit( cChar ) )
return false;
}
return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/scdetect.cxx | 505 +--
1 file changed, 174 insertions(+), 331 deletions(-)
New commits:
commit e69aa9572bb2206313cd2aa7edd13da91460f2c4
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 15:28:57 2013 -0400
fdo#67699: Remove a whole bunch of old hacks.
The new format detection service is much simpler than the old one.
In the new framework, each detection service receives the name of format
that it is expected to check against, and it should either reject it by
returning an empty string in case the file is not of that format, or
if the file is indeed that format, set the appropriate filter name and
return that type to the caller.
We no longer need to deal with preselected filters (which is dealt with
in the detection framework itself) or return an entirely different format
that's different from the one being asked to verify.
Change-Id: I3f36951b0ad821d836fb8a56b852e40d43095f09
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index ce43086..430701a 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -71,6 +71,119 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
+namespace {
+
+const sal_Char pFilterLotus[]= Lotus;
+const sal_Char pFilterQPro6[]= Quattro Pro 6.0;
+const sal_Char pFilterDBase[]= dBase;
+const sal_Char pFilterDif[] = DIF;
+const sal_Char pFilterSylk[] = SYLK;
+
+// Tabelle mit Suchmustern
+// Bedeutung der Sequenzen
+// 0x00??: genau Byte 0x?? muss an dieser Stelle stehen
+// 0x0100: ein Byte ueberlesen (don't care)
+// 0x02nn: ein Byte aus 0xnn Alternativen folgt
+// 0x8000: Erkennung abgeschlossen
+//
+
+#define M_DC0x0100
+#define M_ALT(ANZ) (0x0200+(ANZ))
+#define M_ENDE 0x8000
+
+const sal_uInt16 pLotus[] = // Lotus 1/1A/2
+{ 0x, 0x, 0x0002, 0x,
+M_ALT(2), 0x0004, 0x0006,
+0x0004, M_ENDE };
+
+const sal_uInt16 pLotusNew[] = // Lotus = 9.7
+{ 0x, 0x, M_DC, 0x, // Rec# + Len (0x1a)
+ M_ALT(3), 0x0003, 0x0004, 0x0005, // File Revision Code 97-ME
+ 0x0010, 0x0004, 0x, 0x,
+ M_ENDE };
+
+const sal_uInt16 pLotus2[] = // Lotus 3
+{ 0x, 0x, 0x001A, 0x, // Rec# + Len (26)
+M_ALT(2), 0x, 0x0002, // File Revision Code
+0x0010,
+0x0004, 0x, // File Revision Subcode
+M_ENDE };
+
+const sal_uInt16 pQPro[] =
+ { 0x, 0x, 0x0002, 0x,
+ M_ALT(4), 0x0001, 0x0002, // WB1, WB2
+ 0x0006, 0x0007, // QPro 6/7 (?)
+ 0x0010,
+ M_ENDE };
+
+const sal_uInt16 pDIF1[] = // DIF mit CR-LF
+{
+'T', 'A', 'B', 'L', 'E',
+M_DC, M_DC,
+'0', ',', '1',
+M_DC, M_DC,
+'\',
+M_ENDE };
+
+const sal_uInt16 pDIF2[] = // DIF mit CR oder LF
+{
+'T', 'A', 'B', 'L', 'E',
+M_DC,
+'0', ',', '1',
+M_DC,
+'\',
+M_ENDE };
+
+const sal_uInt16 pSylk[] = // Sylk
+{
+'I', 'D', ';',
+M_ALT(3), 'P', 'N', 'E',// 'P' plus undocumented Excel extensions
'N' and 'E'
+M_ENDE };
+
+bool detectThisFormat(SvStream rStr, const sal_uInt16* pSearch)
+{
+sal_uInt8 nByte;
+rStr.Seek( 0 ); // am Anfang war alles Uebel...
+rStr nByte;
+bool bSync = true;
+while( !rStr.IsEof() bSync )
+{
+sal_uInt16 nMuster = *pSearch;
+
+if( nMuster 0x0100 )
+{ //direkter Byte-Vergleich
+if( ( sal_uInt8 ) nMuster != nByte )
+bSync = false;
+}
+else if( nMuster M_DC )
+{ // don't care
+}
+else if( nMuster M_ALT(0) )
+{ // alternative Bytes
+sal_uInt8 nAnzAlt = ( sal_uInt8 ) nMuster;
+bSync = false; // zunaechst unsynchron
+while( nAnzAlt 0 )
+{
+pSearch++;
+if( ( sal_uInt8 ) *pSearch == nByte )
+bSync = true; // jetzt erst Synchronisierung
+nAnzAlt--;
+}
+}
+else if( nMuster M_ENDE )
+{ //Format detected
+return true;
+}
+
+pSearch++;
+rStr nByte;
+}
+
+return false;
+}
+
+}
+
ScFilterDetect::ScFilterDetect( const uno::Referenceuno::XComponentContext
/*xContext*/ )
{
}
@@ -79,27 +192,10 @@ ScFilterDetect::~ScFilterDetect()
{
}
-static const sal_Char pFilterSc50[] = StarCalc 5.0;
-static const sal_Char pFilterSc50Temp[] = StarCalc 5.0 Vorlage/Template;
-static const sal_Char pFilterSc40[] = StarCalc 4.0;
-static const sal_Char pFilterSc40Temp[] = StarCalc
[Libreoffice-commits] core.git: xmloff/source
xmloff/source/style/xmlexppr.cxx | 45 +--
1 file changed, 25 insertions(+), 20 deletions(-)
New commits:
commit 5f7ee4b7a32153f3141507de673f60c7f678f015
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 10:53:29 2013 -0400
These can be file local.
Change-Id: I71193951ce7a1d1a63fc6931a12267f22cdb72c3
diff --git a/xmloff/source/style/xmlexppr.cxx b/xmloff/source/style/xmlexppr.cxx
index 6888f6e..92e6baa 100644
--- a/xmloff/source/style/xmlexppr.cxx
+++ b/xmloff/source/style/xmlexppr.cxx
@@ -47,6 +47,9 @@ using namespace ::com::sun::star::lang;
using namespace ::xmloff::token;
#define GET_PROP_TYPE( f ) static_castsal_uInt16((f XML_TYPE_PROP_MASK)
XML_TYPE_PROP_SHIFT)
+#define ENTRY(t) { GET_PROP_TYPE(XML_TYPE_PROP_##t), XML_##t##_PROPERTIES }
+
+namespace {
struct XMLPropTokens_Impl
{
@@ -54,12 +57,11 @@ struct XMLPropTokens_Impl
XMLTokenEnum eToken;
};
-#define ENTRY(t) { GET_PROP_TYPE(XML_TYPE_PROP_##t), XML_##t##_PROPERTIES }
const sal_uInt16 MAX_PROP_TYPES =
(XML_TYPE_PROP_END XML_TYPE_PROP_SHIFT) -
(XML_TYPE_PROP_START XML_TYPE_PROP_SHIFT);
-static XMLPropTokens_Impl aPropTokens[MAX_PROP_TYPES] =
+XMLPropTokens_Impl aPropTokens[MAX_PROP_TYPES] =
{
ENTRY(CHART),
ENTRY(GRAPHIC),
@@ -204,24 +206,6 @@ public:
sal_uInt32 GetPropertyCount() const { return nCount; }
};
-struct SvXMLExportPropertyMapper::Impl
-{
-typedef boost::unordered_mapPropertySetInfoKey,
FilterPropertiesInfo_Impl*, PropertySetInfoHash, PropertySetInfoHash CacheType;
-CacheType maCache;
-
-UniReferenceSvXMLExportPropertyMapper mxNextMapper;
-UniReferenceXMLPropertySetMapper mxPropMapper;
-
-OUString maStyleName;
-
-~Impl()
-{
-CacheType::iterator it = maCache.begin(), itEnd = maCache.end();
-for (; it != itEnd; ++it)
-delete it-second;
-}
-};
-
FilterPropertiesInfo_Impl::FilterPropertiesInfo_Impl() :
nCount(0),
aPropInfos(),
@@ -248,6 +232,7 @@ void FilterPropertiesInfo_Impl::AddProperty(
pApiNames = NULL;
}
}
+
const uno::SequenceOUString FilterPropertiesInfo_Impl::GetApiNames()
{
OSL_ENSURE(nCount == aPropInfos.size(), wrong property count);
@@ -531,6 +516,26 @@ void FilterPropertiesInfo_Impl::FillPropertyStateArray(
aPropStates.FillPropertyStateVector(rPropStates);
}
+}
+
+struct SvXMLExportPropertyMapper::Impl
+{
+typedef boost::unordered_mapPropertySetInfoKey,
FilterPropertiesInfo_Impl*, PropertySetInfoHash, PropertySetInfoHash CacheType;
+CacheType maCache;
+
+UniReferenceSvXMLExportPropertyMapper mxNextMapper;
+UniReferenceXMLPropertySetMapper mxPropMapper;
+
+OUString maStyleName;
+
+~Impl()
+{
+CacheType::iterator it = maCache.begin(), itEnd = maCache.end();
+for (; it != itEnd; ++it)
+delete it-second;
+}
+};
+
// ctor/dtor , class SvXMLExportPropertyMapper
SvXMLExportPropertyMapper::SvXMLExportPropertyMapper(
___
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-1' - sc/source
sc/source/core/data/column.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 47ad11491b4a9dcaefd5f9184e34814d0f7520f9 Author: Caolán McNamara caol...@redhat.com Date: Mon Aug 19 16:14:31 2013 +0100 Resolves: fdo#68220 wrong index into source table code in master is all very different, so 4-1-* only I think Change-Id: I9277faa462b66a38c7da3ba9a92b0381c67cfe23 Reviewed-on: https://gerrit.libreoffice.org/5515 Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de Tested-by: Kohei Yoshida kohei.yosh...@suse.de (cherry picked from commit 48cfdaa4fa453af03d18832e3765ffd65a5e107f) Reviewed-on: https://gerrit.libreoffice.org/5517 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index b687489..800c200 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -1361,7 +1361,7 @@ void ScColumn::CopyCellToDocument( SCROW nSrcRow, SCROW nDestRow, ScColumn rDes } ScBaseCell* pDestCell = -maItems[nSrcRow].pCell-Clone( +maItems[nIndex].pCell-Clone( *rDestCol.pDocument, ScAddress(rDestCol.nCol, nDestRow, rDestCol.nTab)); rDestCol.Insert(nDestRow, pDestCell); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/scdetect.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit 0654a592df05df676540764c004bd5b4e8b693a9
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Aug 19 22:33:10 2013 +0200
Seems unused too
Change-Id: I4e71517f34988c3fc2d4b8e7627722d690c1b487
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 430701a..c161072 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -308,7 +308,6 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequencebeans::PropertyValue l
// now some parameters that can already be in the array, but may be
overwritten or new inserted here
// remember their indices in the case new values must be added to the array
sal_Int32 nPropertyCount = lDescriptor.getLength();
-sal_Int32 nIndexOfFilterName = -1;
sal_Int32 nIndexOfInputStream = -1;
sal_Int32 nIndexOfContent = -1;
sal_Int32 nIndexOfReadOnlyFlag = -1;
@@ -337,10 +336,6 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequencebeans::PropertyValue l
{
lDescriptor[nProperty].Value = sTemp;
aPreselectedFilterName = sTemp;
-
-// if the preselected filter name is not correct, it must be
erased after detection
-// remember index of property to get access to it later
-nIndexOfFilterName = nProperty;
}
else if ( lDescriptor[nProperty].Name == InputStream )
nIndexOfInputStream = nProperty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/scdetect.cxx | 10 ++
1 file changed, 10 insertions(+)
New commits:
commit 904ef99d87af1bfefe43f6a84f04f019bd082754
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 16:35:42 2013 -0400
fdo#67699: Don't forget to set filter name to the descriptor.
Actually the detection code works just fine without having the detection
service set the filter name here. But it's supposed to.
Change-Id: Ic6a4325b5ceb532d0691781388f66c24cd695ca5
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index c161072..bdc9ba8 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -634,6 +634,16 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequencebeans::PropertyValue l
if (!pFilter)
aTypeName.Erase();
+if (nIndexOfFilterName == -1)
+{
+lDescriptor.realloc(nPropertyCount + 1);
+lDescriptor[nPropertyCount].Name = FilterName;
+lDescriptor[nPropertyCount].Value = pFilter-GetName();
+++nPropertyCount;
+}
+else
+lDescriptor[nIndexOfFilterName].Value = pFilter-GetName();
+
return aTypeName;
}
___
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' - sc/source
sc/source/ui/unoobj/scdetect.cxx | 516 +--
1 file changed, 184 insertions(+), 332 deletions(-)
New commits:
commit ac9cee0d909ba580a4128f34b675e9f58794ea97
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 15:28:57 2013 -0400
fdo#67699: Remove a whole bunch of old hacks.
The new format detection service is much simpler than the old one.
In the new framework, each detection service receives the name of format
that it is expected to check against, and it should either reject it by
returning an empty string in case the file is not of that format, or
if the file is indeed that format, set the appropriate filter name and
return that type to the caller.
We no longer need to deal with preselected filters (which is dealt with
in the detection framework itself) or return an entirely different format
that's different from the one being asked to verify.
(cherry picked from commit e69aa9572bb2206313cd2aa7edd13da91460f2c4)
Conflicts:
sc/source/ui/unoobj/scdetect.cxx
Change-Id: I3f36951b0ad821d836fb8a56b852e40d43095f09
Reviewed-on: https://gerrit.libreoffice.org/5518
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index fd81a8c..de4959e 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -44,7 +44,6 @@
#include svtools/parhtml.hxx
#include rtl/ustring.h
-#include rtl/logfile.hxx
#include svl/itemset.hxx
#include vcl/window.hxx
#include svl/eitem.hxx
@@ -72,6 +71,119 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ucb;
+namespace {
+
+const sal_Char pFilterLotus[]= Lotus;
+const sal_Char pFilterQPro6[]= Quattro Pro 6.0;
+const sal_Char pFilterDBase[]= dBase;
+const sal_Char pFilterDif[] = DIF;
+const sal_Char pFilterSylk[] = SYLK;
+
+// Tabelle mit Suchmustern
+// Bedeutung der Sequenzen
+// 0x00??: genau Byte 0x?? muss an dieser Stelle stehen
+// 0x0100: ein Byte ueberlesen (don't care)
+// 0x02nn: ein Byte aus 0xnn Alternativen folgt
+// 0x8000: Erkennung abgeschlossen
+//
+
+#define M_DC0x0100
+#define M_ALT(ANZ) (0x0200+(ANZ))
+#define M_ENDE 0x8000
+
+const sal_uInt16 pLotus[] = // Lotus 1/1A/2
+{ 0x, 0x, 0x0002, 0x,
+M_ALT(2), 0x0004, 0x0006,
+0x0004, M_ENDE };
+
+const sal_uInt16 pLotusNew[] = // Lotus = 9.7
+{ 0x, 0x, M_DC, 0x, // Rec# + Len (0x1a)
+ M_ALT(3), 0x0003, 0x0004, 0x0005, // File Revision Code 97-ME
+ 0x0010, 0x0004, 0x, 0x,
+ M_ENDE };
+
+const sal_uInt16 pLotus2[] = // Lotus 3
+{ 0x, 0x, 0x001A, 0x, // Rec# + Len (26)
+M_ALT(2), 0x, 0x0002, // File Revision Code
+0x0010,
+0x0004, 0x, // File Revision Subcode
+M_ENDE };
+
+const sal_uInt16 pQPro[] =
+ { 0x, 0x, 0x0002, 0x,
+ M_ALT(4), 0x0001, 0x0002, // WB1, WB2
+ 0x0006, 0x0007, // QPro 6/7 (?)
+ 0x0010,
+ M_ENDE };
+
+const sal_uInt16 pDIF1[] = // DIF mit CR-LF
+{
+'T', 'A', 'B', 'L', 'E',
+M_DC, M_DC,
+'0', ',', '1',
+M_DC, M_DC,
+'\',
+M_ENDE };
+
+const sal_uInt16 pDIF2[] = // DIF mit CR oder LF
+{
+'T', 'A', 'B', 'L', 'E',
+M_DC,
+'0', ',', '1',
+M_DC,
+'\',
+M_ENDE };
+
+const sal_uInt16 pSylk[] = // Sylk
+{
+'I', 'D', ';',
+M_ALT(3), 'P', 'N', 'E',// 'P' plus undocumented Excel extensions
'N' and 'E'
+M_ENDE };
+
+bool detectThisFormat(SvStream rStr, const sal_uInt16* pSearch)
+{
+sal_uInt8 nByte;
+rStr.Seek( 0 ); // am Anfang war alles Uebel...
+rStr nByte;
+bool bSync = true;
+while( !rStr.IsEof() bSync )
+{
+sal_uInt16 nMuster = *pSearch;
+
+if( nMuster 0x0100 )
+{ //direkter Byte-Vergleich
+if( ( sal_uInt8 ) nMuster != nByte )
+bSync = false;
+}
+else if( nMuster M_DC )
+{ // don't care
+}
+else if( nMuster M_ALT(0) )
+{ // alternative Bytes
+sal_uInt8 nAnzAlt = ( sal_uInt8 ) nMuster;
+bSync = false; // zunaechst unsynchron
+while( nAnzAlt 0 )
+{
+pSearch++;
+if( ( sal_uInt8 ) *pSearch == nByte )
+bSync = true; // jetzt erst Synchronisierung
+nAnzAlt--;
+}
+}
+else if( nMuster M_ENDE )
+{ //Format detected
+return true;
+
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcframegrabber.cxx |2 --
avmedia/source/vlc/wrapper/Instance.cxx | 15 ++-
avmedia/source/vlc/wrapper/Instance.hxx |2 ++
avmedia/source/vlc/wrapper/Media.cxx| 20 ++--
avmedia/source/vlc/wrapper/Media.hxx|3 +++
avmedia/source/vlc/wrapper/Player.cxx | 17 -
avmedia/source/vlc/wrapper/Player.hxx |4 +++-
7 files changed, 56 insertions(+), 7 deletions(-)
New commits:
commit 503d7365de51ca1c12beed967795230b34e4c7c5
Author: Minh Ngo nlmin...@gmail.com
Date: Mon Aug 19 23:42:00 2013 +0300
Fixing copy constructors/operators= for VLC wrapper instances.
Change-Id: I9860b738bbb3a8a85e07555b97203bb63b80b9de
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx
b/avmedia/source/vlc/vlcframegrabber.cxx
index adc59b7..8e75eb3 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -62,8 +62,6 @@ SAL_CALL VLCFrameGrabber::VLCFrameGrabber( VLC::Player
player, boost::shared_pt
return ::uno::Reference css::graphic::XGraphic ();
}
-
-
mPlayer.takeSnapshot( fileName );
mPlayer.setMute( false );
diff --git a/avmedia/source/vlc/wrapper/Instance.cxx
b/avmedia/source/vlc/wrapper/Instance.cxx
index 301d97b..4260836 100644
--- a/avmedia/source/vlc/wrapper/Instance.cxx
+++ b/avmedia/source/vlc/wrapper/Instance.cxx
@@ -8,11 +8,13 @@ namespace VLC
{
libvlc_instance_t* ( *libvlc_new ) ( int argc, const char * const
*argv );
void ( *libvlc_release ) ( libvlc_instance_t *p_instance );
+void ( *libvlc_retain ) ( libvlc_instance_t *p_instance );
ApiMap VLC_INSTANCE_API[] =
{
SYM_MAP( libvlc_new ),
-SYM_MAP( libvlc_release )
+SYM_MAP( libvlc_release ),
+SYM_MAP( libvlc_retain )
};
}
@@ -23,6 +25,17 @@ namespace VLC
mInstance = libvlc_new( sizeof( argv ) / sizeof( argv[0] ), argv );
}
+Instance::Instance( const Instance other )
+{
+}
+
+const Instance Instance::operator=( const Instance other )
+{
+libvlc_release( mInstance );
+mInstance = other.mInstance;
+libvlc_retain( mInstance );
+}
+
Instance::~Instance()
{
libvlc_release( mInstance );
diff --git a/avmedia/source/vlc/wrapper/Instance.hxx
b/avmedia/source/vlc/wrapper/Instance.hxx
index 8358a94..6111262 100644
--- a/avmedia/source/vlc/wrapper/Instance.hxx
+++ b/avmedia/source/vlc/wrapper/Instance.hxx
@@ -27,6 +27,8 @@ namespace VLC
{
public:
Instance( const char * const argv[] );
+Instance( const Instance other );
+const Instance operator=( const Instance other );
virtual ~Instance();
inline operator libvlc_instance_t*()
diff --git a/avmedia/source/vlc/wrapper/Media.cxx
b/avmedia/source/vlc/wrapper/Media.cxx
index 851a4f5..6b7e77e 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -9,12 +9,14 @@ namespace VLC
namespace
{
libvlc_media_t* ( *libvlc_media_new_path ) ( libvlc_instance_t
*p_instance, const char *path );
-void ( *libvlc_media_release )( libvlc_media_t *p_md );
+void ( *libvlc_media_release ) ( libvlc_media_t *p_md );
+void ( *libvlc_media_retain ) ( libvlc_media_t *p_md );
ApiMap VLC_MEDIA_API[] =
{
SYM_MAP( libvlc_media_new_path ),
-SYM_MAP( libvlc_media_release )
+SYM_MAP( libvlc_media_release ),
+SYM_MAP( libvlc_media_retain )
};
libvlc_media_t* InitMedia( const rtl::OUString url, VLC::Instance
instance )
@@ -34,6 +36,20 @@ Media::Media( const rtl::OUString url, Instance instance )
mMedia = InitMedia( url, instance );
}
+Media::Media( const Media other )
+: mMedia( other.mMedia )
+{
+libvlc_media_retain( mMedia );
+}
+
+const Media Media::operator=( const Media other )
+{
+libvlc_media_release( mMedia );
+mMedia = other.mMedia;
+
+libvlc_media_retain( mMedia );
+}
+
Media::~Media()
{
libvlc_media_release( mMedia );
diff --git a/avmedia/source/vlc/wrapper/Media.hxx
b/avmedia/source/vlc/wrapper/Media.hxx
index b513943..483e60b 100644
--- a/avmedia/source/vlc/wrapper/Media.hxx
+++ b/avmedia/source/vlc/wrapper/Media.hxx
@@ -33,6 +33,9 @@ namespace VLC
{
public:
Media( const rtl::OUString url, Instance instance );
+Media( const Media other );
+const Media operator=( const Media other );
+
virtual ~Media();
inline operator libvlc_media_t*()
diff --git a/avmedia/source/vlc/wrapper/Player.cxx
b/avmedia/source/vlc/wrapper/Player.cxx
index a64b747..d4a2525 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -11,6 +11,7 @@ namespace VLC
{
typedef int64_t libvlc_time_t;
+void (
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/scdetect.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit c43a0e35e59b9ccf179852f04784a0f6db5dc191
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Aug 19 22:55:04 2013 +0200
Revert Seems unused too
This reverts commit 0654a592df05df676540764c004bd5b4e8b693a9.
Sorry Kohei for the noise
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 159b52c..ffdb7ea 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -308,6 +308,7 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequencebeans::PropertyValue l
// now some parameters that can already be in the array, but may be
overwritten or new inserted here
// remember their indices in the case new values must be added to the array
sal_Int32 nPropertyCount = lDescriptor.getLength();
+sal_Int32 nIndexOfFilterName = -1;
sal_Int32 nIndexOfInputStream = -1;
sal_Int32 nIndexOfContent = -1;
sal_Int32 nIndexOfReadOnlyFlag = -1;
@@ -336,6 +337,10 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequencebeans::PropertyValue l
{
lDescriptor[nProperty].Value = sTemp;
aPreselectedFilterName = sTemp;
+
+// if the preselected filter name is not correct, it must be
erased after detection
+// remember index of property to get access to it later
+nIndexOfFilterName = nProperty;
}
else if ( lDescriptor[nProperty].Name == InputStream )
nIndexOfInputStream = nProperty;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/ui/ModuleUICategoryDescription.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca543ef07afc6e396535d093b0c77743e20c8109 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Aug 19 23:26:41 2013 +0200 Fix typo in idl Change-Id: I22a9178da0190fa79c81e10511925d2270065680 diff --git a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl index 71fd6a0..923b9a4 100644 --- a/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl +++ b/offapi/com/sun/star/ui/ModuleUICategoryDescription.idl @@ -49,7 +49,7 @@ service ModuleUICategoryDescription can be used by a UI to display the category name. The key to a user interface command category depends on the specific implementation. OpenOffice.org uses a pre-defined number of -identifiers defined in ::com::sun:star::frame::CommandGroup. +identifiers defined in ::com::sun::star::frame::CommandGroup. /p @see ::com::sun::star::frame::ModuleManager ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/inc sc/source
sc/inc/dbdataformatting.hxx | 10 -- sc/source/core/tool/dbdata2.cxx | 10 -- sc/source/core/tool/dbdataformatting.cxx | 10 -- sc/source/filter/excel/xedbdata.cxx | 10 -- sc/source/filter/inc/xedbdata.hxx| 10 -- 5 files changed, 50 deletions(-) New commits: commit bf2de6f8c2d4efab4161915f64aea9ca1fc525a0 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Mon Aug 19 17:31:31 2013 -0400 Fix license headers. These files are brand-new in the LibreOffice code base. Use the right license headers. Change-Id: Ib7e54990cb8eae345905d0718c3ca79c5eb2c9a1 diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx index 812901b..91666c6 100644 --- a/sc/inc/dbdataformatting.hxx +++ b/sc/inc/dbdataformatting.hxx @@ -5,16 +5,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #ifndef SC_DBDATAFORMATTING_HXX #define SC_DBDATAFORMATTING_HXX diff --git a/sc/source/core/tool/dbdata2.cxx b/sc/source/core/tool/dbdata2.cxx index c34d194..0f70a6f 100644 --- a/sc/source/core/tool/dbdata2.cxx +++ b/sc/source/core/tool/dbdata2.cxx @@ -5,16 +5,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ diff --git a/sc/source/core/tool/dbdataformatting.cxx b/sc/source/core/tool/dbdataformatting.cxx index c1f11c2..67f0ba3 100644 --- a/sc/source/core/tool/dbdataformatting.cxx +++ b/sc/source/core/tool/dbdataformatting.cxx @@ -5,16 +5,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include dbdataformatting.hxx diff --git a/sc/source/filter/excel/xedbdata.cxx b/sc/source/filter/excel/xedbdata.cxx index d38cb95..502ea15 100644 --- a/sc/source/filter/excel/xedbdata.cxx +++ b/sc/source/filter/excel/xedbdata.cxx @@ -5,16 +5,6 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include xedbdata.hxx diff --git a/sc/source/filter/inc/xedbdata.hxx b/sc/source/filter/inc/xedbdata.hxx index d3edd2a..def11c7 100644 --- a/sc/source/filter/inc/xedbdata.hxx +++ b/sc/source/filter/inc/xedbdata.hxx @@ -5,16 +5,6 @@ * This Source Code Form is subject to the
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/XMessageBox.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a388856fe749a846b69149f2ec852d8fdd7071e1 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Aug 19 23:37:26 2013 +0200 offapi: fix doxygen warning in awt::XMessageBox.idl Change-Id: I98e90d54ade44a6baf20c8f36bc536f3dfa43ffe diff --git a/offapi/com/sun/star/awt/XMessageBox.idl b/offapi/com/sun/star/awt/XMessageBox.idl index 070b8a8..39b77a2 100644 --- a/offapi/com/sun/star/awt/XMessageBox.idl +++ b/offapi/com/sun/star/awt/XMessageBox.idl @@ -38,7 +38,7 @@ published interface XMessageBox /** shows the message box. @return -one of typeMessageBoxResults/type. +one of MessageBoxResults. */ short execute(); }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/XPopupMenu.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2dd478b633785f7105fbd18a02a993f243536f65 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Aug 19 23:38:33 2013 +0200 offapi: fix doxygen warning in awt::XPopupMenu.idl Change-Id: I68d66e62d6962ec1da471b7c7edc8ca30d70e838 diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl index 57b1c0a..c2bf7e9 100644 --- a/offapi/com/sun/star/awt/XPopupMenu.idl +++ b/offapi/com/sun/star/awt/XPopupMenu.idl @@ -85,7 +85,7 @@ published interface XPopupMenu: XMenu the parent window. @param Position -a typeRectangle/type representing the coordinates system +a Rectangle representing the coordinates system where the popup menu should be executed. @param Direction ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - 2 commits - sc/inc sc/source
sc/inc/dbdataformatting.hxx | 74 +++
sc/source/core/tool/dbdataformatting.cxx | 22 -
2 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit 3a6626f030a495212c8245b4359fecb88ed0f02e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 17:38:08 2013 -0400
Let's consistently use 'm' prefix for data members.
And fix incorrect initialization order.
Change-Id: I3ea1cc2fa19fb28780f076762208e62237a386b2
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index dc9d6ed..c14bed1 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -23,8 +23,8 @@ class SC_DLLPUBLIC ScDBDataFormatting
sal_Int32 maSecondRowStripeSize;
sal_Int32 maFirstColStripeSize;
sal_Int32 maSecondColStripeSize;
-bool bBandedRows;
-bool bBandedColumns;
+bool mbBandedRows;
+bool mbBandedColumns;
public:
ScDBDataFormatting();
ScDBDataFormatting(const OUString rTableStyleName, const OUString
rFirstRowStripeStyle, const OUString rSecondRowStripeStyle, const OUString
rFirstColStripeStyle, const OUString rSecondColStripeStyle, bool bBRows, bool
bBCols);
diff --git a/sc/source/core/tool/dbdataformatting.cxx
b/sc/source/core/tool/dbdataformatting.cxx
index 67f0ba3..07f1ede 100644
--- a/sc/source/core/tool/dbdataformatting.cxx
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -16,12 +16,12 @@ ScDBDataFormatting::ScDBDataFormatting():
maSecondRowStripeStyle ( Default ),
maFirstColStripeStyle ( Default ),
maSecondColStripeStyle ( Default ),
-bBandedRows ( false ),
-bBandedColumns ( false ),
maFirstRowStripeSize( 1 ),
maSecondRowStripeSize ( 1 ),
maFirstColStripeSize( 1 ),
-maSecondColStripeSize ( 1 )
+maSecondColStripeSize ( 1 ),
+mbBandedRows( false ),
+mbBandedColumns ( false )
{
}
@@ -31,8 +31,8 @@ ScDBDataFormatting::ScDBDataFormatting(const OUString
rTableStyleName, const OU
maSecondRowStripeStyle ( rSecondRowStripeStyle ),
maFirstColStripeStyle ( rFirstColStripeStyle ),
maSecondColStripeStyle ( rSecondColStripeStyle ),
-bBandedRows ( bBRows ),
-bBandedColumns ( bBCols )
+mbBandedRows( bBRows ),
+mbBandedColumns ( bBCols )
{
}
@@ -42,8 +42,8 @@ ScDBDataFormatting::ScDBDataFormatting( const
ScDBDataFormatting rTableFormatDa
maSecondRowStripeStyle ( rTableFormatData.maSecondRowStripeStyle ),
maFirstColStripeStyle ( rTableFormatData.maFirstColStripeStyle ),
maSecondColStripeStyle ( rTableFormatData.maSecondColStripeStyle ),
-bBandedRows ( rTableFormatData.bBandedRows ),
-bBandedColumns ( rTableFormatData.bBandedColumns )
+mbBandedRows( rTableFormatData.mbBandedRows ),
+mbBandedColumns ( rTableFormatData.mbBandedColumns )
{
}
@@ -59,22 +59,22 @@ const OUString ScDBDataFormatting::GetTableStyleName()
void ScDBDataFormatting::SetBandedRows( bool bBRows )
{
-bBandedRows = bBRows;
+mbBandedRows = bBRows;
}
bool ScDBDataFormatting::GetBandedRows()
{
-return bBandedRows;
+return mbBandedRows;
}
void ScDBDataFormatting::SetBandedColumns( bool bBCols )
{
-bBandedColumns = bBCols;
+mbBandedColumns = bBCols;
}
bool ScDBDataFormatting::GetBandedColumns()
{
-return bBandedColumns;
+return mbBandedColumns;
}
const OUString ScDBDataFormatting::GetFirstRowStripeStyle() const
commit f3f060986ff8dcd310dfa944259c7189b9d8c3cd
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 17:32:55 2013 -0400
Fix excessive indentation.
Change-Id: I464c8e103f1c31f9e4321b4f481413df6a4822e7
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index 91666c6..dc9d6ed 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -14,43 +14,43 @@
class SC_DLLPUBLIC ScDBDataFormatting
{
-OUString maTableStyleName;
-OUString maFirstRowStripeStyle;
-OUString maSecondRowStripeStyle;
-OUString maFirstColStripeStyle;
-OUString maSecondColStripeStyle;
-sal_Int32 maFirstRowStripeSize;
-sal_Int32 maSecondRowStripeSize;
-sal_Int32 maFirstColStripeSize;
-sal_Int32 maSecondColStripeSize;
-bool bBandedRows;
-bool bBandedColumns;
-public:
-ScDBDataFormatting();
-ScDBDataFormatting(const OUString rTableStyleName, const OUString
rFirstRowStripeStyle, const OUString rSecondRowStripeStyle, const OUString
rFirstColStripeStyle, const OUString rSecondColStripeStyle, bool bBRows, bool
bBCols);
-ScDBDataFormatting( const ScDBDataFormatting rTableFormatData );
-void SetTableStyleName( const OUString rTableStyleName );
-const OUString GetTableStyleName();
-void SetBandedRows( bool bBRows );
-
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) New commits: commit eca84d61bc5b950816eba632937154e0ba2610ba Author: Julien Nabet serval2...@yahoo.fr Date: Mon Aug 19 23:40:46 2013 +0200 offapi: fix doxygen warning in ucb::XWebDAVCommandEnvironment.idl Change-Id: Ie54315ebf76707848de635e75b9689ef8d06e0ea diff --git a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl index bbf072c..8c04e25 100644 --- a/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl +++ b/offapi/com/sun/star/ucb/XWebDAVCommandEnvironment.idl @@ -39,8 +39,7 @@ interface XWebDAVCommandEnvironment : XCommandEnvironment The request URI. @param aMethod -The WebDAV/HTTP method (GET,PUT,MKCOL,...) as defined in -typeWebDAVHTTPMethod/type. +The WebDAV/HTTP method (GET,PUT,MKCOL,...) as defined in WebDAVHTTPMethod. @return A sequence of header name, header value pairs. The header ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - 2 commits - sc/inc sc/source
sc/inc/dbdata.hxx |4 ++--
sc/source/core/tool/dbdata2.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ee6a3b678319b0740a338781cf6cce6e1bd963e0
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 17:52:18 2013 -0400
Ensure correct initialization order.
Change-Id: Ife8a4f0654d1ca6e9342750ff53c6f3e00bbc286
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index f337a38..a7a49b5 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -58,7 +58,6 @@ private:
boolbDoSize;
boolbKeepFmt;
boolbStripData;
-boolbHasFormatting;
/// QueryParam
boolbIsAdvanced;/// true if created by advanced filter
@@ -69,6 +68,7 @@ private:
sal_uInt16 nIndex; /// unique index formulas
boolbAutoFilter;/// AutoFilter? (not saved)
boolbModified; /// is set/cleared for/by(?)
UpdateReference
+boolbHasFormatting;
using ScRefreshTimer::operator==;
commit 82acea96bbf9ac89feddbf91e1881330b26c253b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Aug 19 17:48:16 2013 -0400
Don't return a reference to a temporary variable.
That's a recipe for trouble.
Change-Id: I78647225209e57cf88c04718d99a07142983369d
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index e6a35ed..f337a38 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -156,7 +156,7 @@ public:
SCsCOL nDx, SCsROW nDy, SCsTAB nDz);
void ExtendDataArea(ScDocument* pDoc);
-const OUString GetCellStyle( const ScAddress rPos, bool bRowStripe );
+OUString GetCellStyle( const ScAddress rPos, bool bRowStripe );
};
class SC_DLLPUBLIC ScDBCollection
diff --git a/sc/source/core/tool/dbdata2.cxx b/sc/source/core/tool/dbdata2.cxx
index 0f70a6f..879437a 100644
--- a/sc/source/core/tool/dbdata2.cxx
+++ b/sc/source/core/tool/dbdata2.cxx
@@ -11,7 +11,7 @@
#include dbdata.hxx
#include dbdataformatting.hxx
-const OUString ScDBData::GetCellStyle( const ScAddress rPos, bool bRowStripe
)
+OUString ScDBData::GetCellStyle( const ScAddress rPos, bool bRowStripe )
{
//first see if the DB Range has any DB Formatting at all
if( !HasFormatting() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com udkapi/com
offapi/com/sun/star/frame/XLoaderFactory.idl |4 ++--
offapi/com/sun/star/resource/OfficeResourceLoader.idl |4 ++--
udkapi/com/sun/star/lang/Locale.idl |4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 1aebeb0208a3643529eef23a0c5a1a0d0b366716
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Aug 20 00:01:01 2013 +0200
Fix doxygen warnings in udkapi and offapi
Change-Id: If2235c959aa409376397f306145bea0bee713c78
diff --git a/offapi/com/sun/star/frame/XLoaderFactory.idl
b/offapi/com/sun/star/frame/XLoaderFactory.idl
index ac6f614..750c06c4 100644
--- a/offapi/com/sun/star/frame/XLoaderFactory.idl
+++ b/offapi/com/sun/star/frame/XLoaderFactory.idl
@@ -55,12 +55,12 @@ published interface XLoaderFactory
/p
table border=1
tr
-tdbTypesb/td
+tdbTypes/b/td
td[string]/td
tdfile types which loader is registered for/td
/tr
tr
-tdbUINameb/td
+tdbUIName/b/td
td[string]/td
tdUI representable and localized name/td
/tr
diff --git a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
index becd687..2a28679 100644
--- a/offapi/com/sun/star/resource/OfficeResourceLoader.idl
+++ b/offapi/com/sun/star/resource/OfficeResourceLoader.idl
@@ -28,7 +28,7 @@ module com { module sun { module star { module resource {
resource files.
pAn OpenOffice.org installation comes with a number of resource files in
an proprietary
-format, located inside the installation's program/resource directory. The
OfficeResoureLoader
+format, located inside the installation's program/resource directory. The
OfficeResourceLoader
singleton (available at a component context as value with the key
code/singletons/com.sun.star.resource.OfficeResourceLoader/code),
provides access to some
types of resources within those files./p
@@ -44,7 +44,7 @@ module com { module sun { module star { module resource {
pResource keys, as passed to the XResourceBundle::getDirectElement() or
com::sun::star::container::XNameAccess::getByName(), have the following
format:
-codelt;resource_typegt;:lt;numeric_identifiergt;/code, where
codelt;resource_typegt; specifies
+codelt;resource_typegt;:lt;numeric_identifiergt;/code, where
codelt;resource_typegt;/code specifies
the type of the requested resource (see below) and
codelt;numeric_identifiergt;/code is the numeric
identifier of the resource./p
diff --git a/udkapi/com/sun/star/lang/Locale.idl
b/udkapi/com/sun/star/lang/Locale.idl
index f45af42..5033824 100644
--- a/udkapi/com/sun/star/lang/Locale.idl
+++ b/udkapi/com/sun/star/lang/Locale.idl
@@ -55,7 +55,7 @@ published struct Locale
pThese codes are the lower-case two-letter codes as defined by
ISO-639. You can find a full list of these codes at a number of
-sites, such as: br
+sites, such as: br/
a href=http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt;
codehttp://www.ics.uci.edu/pub/ietf/http/related/iso639.txt/code/a.
/p
@@ -69,7 +69,7 @@ published struct Locale
pThese codes are the upper-case two-letter codes as
defined by ISO-3166. You can find a full list of these codes at a
-number of sites, such as: br
+number of sites, such as: br/
a href=http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html;
codehttp://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html/code/a.
/p
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/awt/XMessageBoxFactory.idl |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 2f328ab300175c38ae51025469c1e85b3caf62cd Author: Julien Nabet serval2...@yahoo.fr Date: Tue Aug 20 00:26:03 2013 +0200 Fix doxygen in offapi, awt/XMessageBoxFactory.idl Change-Id: Iee4f792d35b8caf13bbd1c9ec7aefe38f185dcbb diff --git a/offapi/com/sun/star/awt/XMessageBoxFactory.idl b/offapi/com/sun/star/awt/XMessageBoxFactory.idl index 22b0b7b..3a1df41 100644 --- a/offapi/com/sun/star/awt/XMessageBoxFactory.idl +++ b/offapi/com/sun/star/awt/XMessageBoxFactory.idl @@ -42,10 +42,10 @@ published interface XMessageBoxFactory : com::sun::star::uno::XInterface pThis parameter must not be null./p -@param aType +@param eType the message box type. -@param aButtons +@param nButtons specifies which buttons should be available on the message box. pA combination of com::sun::star::awt::MessageBoxButtons/p @@ -53,10 +53,10 @@ published interface XMessageBoxFactory : com::sun::star::uno::XInterface ignores this paramter, instead it uses a com::sun::star::awt::MessageBoxButtons::BUTTONS_OK./p -@param aTitle +@param sTitle specifies the title of the message box. -@param aMessage +@param sMessage specifies text which will be shown by the message box. Line-breaks must be added using 'CR' or 'CR+LF'. */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Non-debug Windows daily builds: tb39
Hi Kendy, Petr, all This would be the perfect opportunity to run a debug build but the latest available is from the 13th of August, so it's probably not worth running it to check today's bugs? ape wrote The debug master build from the 13th (Version: 4.2.0.0.alpha0+ Build ID: 73c02c20b19702dbe662fe0d80601049f015d8ac TinderBox: Win-x86@6-debug, Branch:master, Time: 2013-08-13_21:26:14) worked correctly so it won't help in solving the problems that were added posteriorly (except that now you know that it did work on the 13th). Two more comments: 1) Please include in each daily build folder for Tinderboxes 39 and 42 a text file with details on the build like http://dev-builds.libreoffice.org/daily/master/Win-x86@6-debug/2013-08-13_21.26.14/master~2013-08-13_21.26.14_build_info.txt 2) Would it be possible to add some checksum information in the txt file? Something like the first section of http://download.documentfoundation.org/libreoffice/stable/4.1.0/win/x86/LibreOffice_4.1.0_Win_x86.msi.mirrorlist Or maybe on a separate file? Cheers, Pedro -- View this message in context: http://nabble.documentfoundation.org/Non-debug-Windows-daily-builds-tp4069175p4070577.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Non-debug Windows daily builds: tb39
Hi Pedro, Pedro píše v Ne 18. 08. 2013 v 13:31 -0700: I can confirm that build master~2013-08-17_23.59.35_LibreOfficeDev_4.2.0.0.alpha0_Win_x86 from tinderbox 39 fails to run on Windows XP x86 SP3 en_US because it misses some MSVC dlls. I suppose it is due to a new MSVC; but should be fixable anyway - any chance you can create a 4.2 MAB for that? I can also confirm that the build libo-master~2013-08-17_22.48.29_LibreOfficeDev_4.2.0.0.alpha0_Win_x86 from Tinderbox 42 crashes on start. No idea - Thorsten? All the best, Kendy ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
