[Libreoffice-commits] .: sw/source
sw/source/core/text/xmldump.cxx | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 8da05bd82457ad4bd90a61f806e4f0632a9c0273
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Mar 20 09:33:55 2012 +0200
WaE: '%u' expects 'unsigned int', but argument is 'sal_uInt32'
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index e443f6d..18b92e7 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -346,15 +346,15 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( ptr ), %p, this );
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( id ), %u,
GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( id ),
%SAL_PRIuUINT32, GetFrmId() );
if ( GetNext( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( next ), %u,
GetNext()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( next ),
%SAL_PRIuUINT32, GetNext()-GetFrmId() );
if ( GetPrev( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ), %u,
GetPrev()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ),
%SAL_PRIuUINT32, GetPrev()-GetFrmId() );
if ( GetUpper( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ), %u,
GetUpper()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ),
%SAL_PRIuUINT32, GetUpper()-GetFrmId() );
if ( GetLower( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ), %u,
GetLower()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ),
%SAL_PRIuUINT32, GetLower()-GetFrmId() );
if ( IsTxtFrm( ) )
{
SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this;
@@ -390,30 +390,30 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr
writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %u,
GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%u, static_castSwTxtFrm*(m_pPrecede)-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwTxtFrm*(m_pPrecede)-GetFrmId() );
}
void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %u,
GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%u, static_castSwSectionFrm*( m_pPrecede )-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwSectionFrm*( m_pPrecede )-GetFrmId() );
}
void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %u,
GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%u, static_castSwTabFrm*( m_pPrecede )-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwTabFrm*( m_pPrecede )-GetFrmId() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source vcl/inc vcl/unx
sw/source/core/text/xmldump.cxx | 22 +++---
vcl/inc/unx/saldata.hxx |1 -
vcl/unx/generic/window/salframe.cxx |1 +
3 files changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 086aa1cf2ab5017e2313aea6ffd84585fe6a4a43
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Mar 20 08:53:19 2012 +0100
C++11: invalid string literal suffix
so let's make the sal_intXY ugliness even a bit more ugly
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 18b92e7..7df0ec8 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -346,15 +346,15 @@ void SwFrm::dumpInfosAsXml( xmlTextWriterPtr writer )
void SwFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( ptr ), %p, this );
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( id ),
%SAL_PRIuUINT32, GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( id ), %
SAL_PRIuUINT32, GetFrmId() );
if ( GetNext( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( next ),
%SAL_PRIuUINT32, GetNext()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( next ), %
SAL_PRIuUINT32, GetNext()-GetFrmId() );
if ( GetPrev( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ),
%SAL_PRIuUINT32, GetPrev()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( prev ), %
SAL_PRIuUINT32, GetPrev()-GetFrmId() );
if ( GetUpper( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ),
%SAL_PRIuUINT32, GetUpper()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( upper ), %
SAL_PRIuUINT32, GetUpper()-GetFrmId() );
if ( GetLower( ) )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ),
%SAL_PRIuUINT32, GetLower()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( lower ), %
SAL_PRIuUINT32, GetLower()-GetFrmId() );
if ( IsTxtFrm( ) )
{
SwTxtFrm *pTxtFrm = ( SwTxtFrm * ) this;
@@ -390,30 +390,30 @@ void SwTxtFrm::dumpAsXmlAttributes( xmlTextWriterPtr
writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %
SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwTxtFrm*(m_pPrecede)-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ), %
SAL_PRIuUINT32, static_castSwTxtFrm*(m_pPrecede)-GetFrmId() );
}
void SwSectionFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %
SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwSectionFrm*( m_pPrecede )-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ), %
SAL_PRIuUINT32, static_castSwSectionFrm*( m_pPrecede )-GetFrmId() );
}
void SwTabFrm::dumpAsXmlAttributes( xmlTextWriterPtr writer )
{
SwFrm::dumpAsXmlAttributes( writer );
if ( HasFollow() )
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ),
%SAL_PRIuUINT32, GetFollow()-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( follow ), %
SAL_PRIuUINT32, GetFollow()-GetFrmId() );
if (m_pPrecede != NULL)
-xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ),
%SAL_PRIuUINT32, static_castSwTabFrm*( m_pPrecede )-GetFrmId() );
+xmlTextWriterWriteFormatAttribute( writer, BAD_CAST( precede ), %
SAL_PRIuUINT32, static_castSwTabFrm*( m_pPrecede )-GetFrmId() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit cf25b76b685ae8b74310f001798876651e89e51a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Mar 20 08:44:11 2012 +0100
move #include from .h to the one .cxx where it is needed
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 591f4f6..121bdd0 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -30,7 +30,6 @@
#define _SV_SALDATA_HXX
// -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include signal.h
#include unx/salunx.h
#include vcl/salgtype.hxx
#include unx/salstd.hxx
diff --git a/vcl/unx/generic/window/salframe.cxx
b/vcl/unx/generic/window/salframe.cxx
index 0cebdbc..43f6acd 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++
[Libreoffice-commits] .: 3 commits - binaryurp/source configmgr/source rdbmaker/inc rdbmaker/source
binaryurp/source/bridgefactory.cxx |1 -
binaryurp/source/reader.cxx |1 -
configmgr/source/services.cxx|1 -
rdbmaker/inc/codemaker/registry.hxx |6 --
rdbmaker/inc/codemaker/typemanager.hxx | 10 +-
rdbmaker/source/codemaker/dependency.cxx |7 ---
rdbmaker/source/rdbmaker/rdbmaker.cxx|6 +-
rdbmaker/source/rdbmaker/rdboptions.cxx |2 --
8 files changed, 2 insertions(+), 32 deletions(-)
New commits:
commit a2e37bd3f0fe6d24c6fc0a4c7e4d5744c884e546
Author: Luke Petrolekas luke.petrole...@gmail.com
Date: Mon Mar 19 18:55:10 2012 -0400
Delete commented out code
diff --git a/rdbmaker/inc/codemaker/registry.hxx
b/rdbmaker/inc/codemaker/registry.hxx
index 7686cc5..eadbb7d 100644
--- a/rdbmaker/inc/codemaker/registry.hxx
+++ b/rdbmaker/inc/codemaker/registry.hxx
@@ -77,12 +77,6 @@ struct TypeReader_Impl
class TypeReader
{
-/*
-inline TypeReader(const RegistryTypeReader_Api* pApi,
- const sal_uInt8* buffer,
- sal_uInt32 bufferLen,
- sal_Bool copyData);
-*/
public:
inline TypeReader()
: m_pImpl(NULL)
diff --git a/rdbmaker/inc/codemaker/typemanager.hxx
b/rdbmaker/inc/codemaker/typemanager.hxx
index b651e9b..6feba4d 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -125,15 +125,7 @@ public:
{
acquire();
}
-/*
-RegistryTypeManager operator = ( const RegistryTypeManager value )
-{
-release();
-m_pImpl = value.m_pImpl;
-acquire();
-return *this;
-}
-*/
+
using TypeManager::init;
sal_Bool init(sal_Bool bMerge, const StringVector regFiles);
diff --git a/rdbmaker/source/codemaker/dependency.cxx
b/rdbmaker/source/codemaker/dependency.cxx
index 0ca56c3..a8ceb25 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -113,7 +113,6 @@ sal_Bool TypeDependency::hasDependencies(const OString
type)
void TypeDependency::setGenerated(const OString type, sal_uInt16 genFlag)
{
-// m_pImpl-m_generatedTypes.insert(type);
if (m_pImpl-m_generatedTypes.count(type) 0)
m_pImpl-m_generatedTypes[type]= m_pImpl-m_generatedTypes[type] |
genFlag;
else
@@ -122,12 +121,6 @@ void TypeDependency::setGenerated(const OString type,
sal_uInt16 genFlag)
sal_Bool TypeDependency::isGenerated(const OString type, sal_uInt16 genFlag)
{
-/*
-if (m_pImpl-m_generatedTypes.count(type) 0)
-return sal_True;
-
-return sal_False;
-*/
if (m_pImpl-m_generatedTypes.count(type) 0
m_pImpl-m_generatedTypes[type] genFlag)
{
commit eb1c4f8ff0611bab1dd0ad92e25d82092a971731
Author: Luke Petrolekas luke.petrole...@gmail.com
Date: Mon Mar 19 18:12:35 2012 -0400
Remove commented out code.
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx
b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index a383346..490a8fd 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -456,11 +456,7 @@ int __cdecl main( int argc, char * argv[] )
ret = produceType(typeName.replace('.', '/'), typeMgr,
typeDependencies,
options, listFile, rootKey,
filterTypes);
}
-/*
-// produce only this type
-ret = produceType(typeName.replace('.', '/'), typeMgr,
typeDependencies,
- options, listFile, rootKey, filterTypes);
-*/
+
if (!ret)
{
fprintf(stderr, %s ERROR: %s\n,
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx
b/rdbmaker/source/rdbmaker/rdboptions.cxx
index cc78f7a..07478fd 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -350,8 +350,6 @@ OString RdbOptions::prepareHelp()
help += -L = specifies that only a text file is generated
with the\n;
help +=names of the specified types and their
dependencies.\n;
help +=Default is that a registry file will be
created\n;
-// help += -Xxmlfile = xmlfile specifies the name of an xml
description where\n;
-// help +=all types are specified which will be
generated.\n;
help += -Tname = name specifies a type or a list of types. The
output for\n;
help += [t1;...] this type is generated.\n;
help +=Example: 'com.sun.star.uno.XInterface' is a
valid type.\n;
commit a4abe212c193f369425f003a91116f65e9918c9a
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 20 08:56:53 2012 +0100
Unused includes
diff --git a/binaryurp/source/bridgefactory.cxx
b/binaryurp/source/bridgefactory.cxx
index 0edbaa0..f3e06ab 100644
--- a/binaryurp/source/bridgefactory.cxx
+++
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/source
svx/source/items/algitem.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 85c6043d0d339d3df6a4037eedce78df38272ea6
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Mar 18 16:36:54 2012 +0100
Fix redundant assignment of nAngle in switch
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index ff93abb..5fa6d82 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -180,8 +180,8 @@ sal_Int32 SvxOrientationItem::GetRotation( sal_Int32
nStdAngle ) const
sal_Int32 nAngle = nStdAngle;
switch( static_cast SvxCellOrientation ( GetValue() ) )
{
-case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
-case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;
+case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;break;
+case SVX_ORIENTATION_TOPBOTTOM: nAngle = 27000;break;
default: ; //prevent warning
}
return nAngle;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 066d9b97414d103614b18b83df2df82ac9c07620
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Mar 20 09:58:36 2012 +0100
cleanup: use lcl_getParagraphBorder() while parsing RTF_BOX
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index f8da21d..84267f3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1756,10 +1756,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
{
RTFSprms aAttributes;
RTFValue::Pointer_t pValue(new RTFValue(aAttributes));
-
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcTop,
pValue));
-
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcLeft,
pValue));
-
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcBottom,
pValue));
-
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcRight,
pValue));
+for (int i = 0; i 4; i++)
+
m_aStates.top().aParagraphSprms-push_back(make_pair(lcl_getParagraphBorder(i),
pValue));
m_aStates.top().nBorderState = BORDER_PARAGRAPH_BOX;
}
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 73a5ef4cb245acb120f02d487ba7c3aeb40f4fad
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Thu Mar 15 11:22:32 2012 +0100
fdo#46843 look for order by clause as fifth child of select_statement
Since commit 33b9b857ea6cb5a6f731de68f58e532242c43d30 (dba34c: #i20306#
support for window function and limit fetch first, ... added), order by is the
fifth child. It was the fourth one before.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 3f500b7..c9c6092 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2318,9 +2318,9 @@ namespace
const ::connectivity::OSQLParseNode* pParseRoot )
{
SqlParseError eErrorCode = eOk;
-if (!pParseRoot-getChild(3)-getChild(4)-isLeaf())
+if (!pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-isLeaf())
{
-::connectivity::OSQLParseNode* pNode =
pParseRoot-getChild(3)-getChild(4)-getChild(2);
+::connectivity::OSQLParseNode* pNode =
pParseRoot-getChild(3)-getChild(ORDER_BY_CHILD_POS)-getChild(2);
::connectivity::OSQLParseNode* pParamRef = NULL;
OQueryController rController =
static_castOQueryController(_pView-getController());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx|2 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 12 ++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |1 +
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 9f6e09e241921c6c4260ab530374de8d5ccd4267
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Mar 20 11:03:08 2012 +0100
fdo#47560 properly separate each new sorting column
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 12b5b29..4e6d852 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2326,9 +2326,9 @@ namespace
OQueryController rController =
static_castOQueryController(_pView-getController());
EOrderDir eOrderDir;
-OTableFieldDescRef aDragLeft = new OTableFieldDesc();
for( sal_uInt32 i=0 ; ipNode-count() ; i++ )
{
+OTableFieldDescRef aDragLeft = new OTableFieldDesc();
eOrderDir = ORDER_ASC;
::connectivity::OSQLParseNode* pChild = pNode-getChild( i );
commit 470feb03f11e015b69fc5df11bd141f536eb8c91
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Mar 20 11:01:12 2012 +0100
fdo#47370 properly duplicate (invisible) out-of-order sort columns
Keep track of position of previous sorting column and use it to decide
whether to duplicate invisible new sort column
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 35a08f5..b9a73e8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -69,6 +69,7 @@ const String g_strZero = String::CreateFromAscii(0);
#define CHECKBOX_SIZE 10
#define HANDLE_ID0
#define HANDLE_COLUMN_WITDH 70
+#define SORT_COLUMN_NONE0x
//
-
namespace
@@ -114,6 +115,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
BROWSER_HIDECURSOR | BROWSER_HLINESFULL |
BROWSER_VLINESFULL )
,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS))
,m_nVisibleCount(0)
+ ,m_nLastSortColumn(SORT_COLUMN_NONE)
,m_bOrderByUnRelated(sal_True)
,m_bGroupByUnRelated(sal_True)
,m_bStopTimer(sal_False)
@@ -420,6 +422,7 @@ void OSelectionBrowseBox::ClearAll()
aIter = getFields().rbegin();
}
}
+m_nLastSortColumn = SORT_COLUMN_NONE;
SetUpdateMode(sal_True);
}
//--
@@ -1875,11 +1878,14 @@ void OSelectionBrowseBox::AddCondition( const
OTableFieldDescRef rInfo, const S
//--
void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef rInfo, const
EOrderDir eDir, sal_uInt32 _nCurrentPos)
{
+if (_nCurrentPos == 0)
+m_nLastSortColumn = SORT_COLUMN_NONE;
+
Reference XConnection xConnection =
static_castOQueryController(getDesignView()-getController()).getConnection();
if(!xConnection.is())
return;
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-OSL_ENSURE(!rInfo-IsEmpty(),AddOrder:: OTableFieldDescRef sollte nicht
Empty sein!);
+OSL_ENSURE(!rInfo-IsEmpty(),AddOrder:: OTableFieldDescRef should not be
Empty!);
OTableFieldDescRef pEntry;
ReferenceXDatabaseMetaData xMeta = xConnection-getMetaData();
::comphelper::UStringMixEqual bCase(xMeta.is()
xMeta-supportsMixedCaseQuotedIdentifiers());
@@ -1898,7 +1904,7 @@ void OSelectionBrowseBox::AddOrder( const
OTableFieldDescRef rInfo, const EOrde
bCase(aAlias,rInfo-GetAlias()))
{
sal_uInt32 nPos = aIter - rFields.begin();
-bAppend = _nCurrentPos nPos;
+bAppend = (m_nLastSortColumn != SORT_COLUMN_NONE) (nPos =
m_nLastSortColumn);
if ( bAppend )
aIter = rFields.end();
else
@@ -1906,6 +1912,7 @@ void OSelectionBrowseBox::AddOrder( const
OTableFieldDescRef rInfo, const EOrde
if ( !m_bOrderByUnRelated )
pEntry-SetVisible(sal_True);
pEntry-SetOrderDir( eDir );
+m_nLastSortColumn = nPos;
}
break;
}
@@ -1916,6 +1923,7 @@ void OSelectionBrowseBox::AddOrder( const
OTableFieldDescRef rInfo, const EOrde
OTableFieldDescRef pTmp = InsertField(rInfo, BROWSER_INVALIDID,
sal_False, sal_False );
if(pTmp.is())
{
+m_nLastSortColumn = pTmp-GetColumnId() - 1;
if ( !m_bOrderByUnRelated !bAppend )
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/documen5.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f24545a72cf43d0852c4f8edae0b3a9919120cdd
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Mar 19 20:59:01 2012 +0100
check for negative sheet number here too, fdo#47503
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx
index f19a067..7b83b53 100644
--- a/sc/source/core/data/documen5.cxx
+++ b/sc/source/core/data/documen5.cxx
@@ -636,7 +636,7 @@ void ScDocument::SetChartRangeList( const rtl::OUString
rChartName,
bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
-if (nTab static_castSCTAB(maTabs.size()) maTabs[nTab])
+if ( VALIDTAB(nTab) nTab static_castSCTAB(maTabs.size())
maTabs[nTab])
return maTabs[nTab]-HasData( nCol, nRow );
else
return false;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/start.c |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 7b9ea611bea133e758302b99df339439919101ed
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 20 11:22:19 2012 +0100
Resolves rhbz#804437, do not rtl_uString_release(NULL)
...in case osl_getProcessWorkingDir fails (e.g., if it has been unlinked).
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index f2c6e58..410c2fd 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -358,7 +358,10 @@ get_pipe_path( rtl_uString *pAppPath )
rtl_uString_release( pMd5hash );
rtl_uString_release( pPath );
rtl_uString_release( pTmp );
-rtl_uString_release( pBasePath );
+if ( pBasePath )
+{
+rtl_uString_release( pBasePath );
+}
rtl_uString_release( pUserInstallation );
rtl_uString_release( pAbsUserInstallation );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/glyphs/graphite_layout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3a878d3dbfdb11cf2f0cce9dbf28a408c130d556
Author: Petr Mladek pmla...@suse.cz
Date: Tue Mar 20 11:35:13 2012 +0100
vcl: better check in GraphiteLayout::expandOrCondense:
Improves the commit d066f7e4afb3c9e395932ba7bf8715ad0770bcdd that
fixed crash when printing the bugdoc from i#103958
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 1ec9650..93c1bc5 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -847,7 +847,7 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs rArgs)
assert(nCharIndex -1);
mvCharDxs[nCharIndex-mnMinCharPos] += nOffset;
// adjust char dxs for rest of characters in cluster
-while (++nCharIndex
static_castint(mvChar2BaseGlyph.size()))
+while (++nCharIndex - mnMinCharPos
static_castint(mvChar2BaseGlyph.size()))
{
int nChar2Base =
mvChar2BaseGlyph[nCharIndex-mnMinCharPos];
if (nChar2Base == -1 || nChar2Base ==
static_castint(i))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - canvas/inc canvas/source
canvas/inc/canvas/base/sprite.hxx |2 +-
canvas/inc/canvas/spriteredrawmanager.hxx |2 +-
canvas/source/tools/spriteredrawmanager.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8f769141f35f18782f3e43862baedf40d3ce19c6
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 22 00:31:30 2012 +0100
Fix fdo#45219 wrong transparency for animated objects.
With the attachement from said bug, and cairocanvas, sprites
are displayed multiple times above each other (which, for semi-
transparent sprites, lead to incorrect overall transparency)
diff --git a/canvas/inc/canvas/base/sprite.hxx
b/canvas/inc/canvas/base/sprite.hxx
index bb3d655..38a2270 100644
--- a/canvas/inc/canvas/base/sprite.hxx
+++ b/canvas/inc/canvas/base/sprite.hxx
@@ -103,7 +103,7 @@ namespace canvas
/** Functor providing a StrictWeakOrdering for sprite references
*/
-struct SpriteComparator
+struct SpriteWeakOrder
{
bool operator()( const Sprite::Reference rLHS,
const Sprite::Reference rRHS )
diff --git a/canvas/inc/canvas/spriteredrawmanager.hxx
b/canvas/inc/canvas/spriteredrawmanager.hxx
index 3bf4ca6..9dc2099 100644
--- a/canvas/inc/canvas/spriteredrawmanager.hxx
+++ b/canvas/inc/canvas/spriteredrawmanager.hxx
@@ -361,7 +361,7 @@ namespace canvas
::std::sort( aSortedUpdateSprites.begin(),
aSortedUpdateSprites.end(),
- SpriteComparator() );
+ SpriteWeakOrder() );
if( isAreaUpdateOpaque( rUpdateArea,
nNumSprites ) )
diff --git a/canvas/source/tools/spriteredrawmanager.cxx
b/canvas/source/tools/spriteredrawmanager.cxx
index 2af5b34..06d6127 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -233,7 +233,7 @@ namespace canvas
// in line with the problem of having sprite state available
// for the frame before the last frame; plus, it avoids
// frequent locks of the object mutices
-SpriteComparator aSpriteComparator;
+SpriteWeakOrder aSpriteComparator;
// put all sprites that have changed content into update areas
ListOfSprites::const_iterator aCurrSprite( maSprites.begin() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source
vcl/source/glyphs/graphite_layout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 39a7666cc0ac056bb682c89163a8d2155f57b775
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 22 23:48:52 2012 +0100
vcl: crash in GraphiteLayout::expandOrCondense:
When printing the bugdoc from i#103958:
error: attempt to subscript container with out-of-bounds index 5, but
container only holds 5 elements.
Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Martin Hosken martin_hos...@sil.org
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index d39c292..e0898b2 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -843,7 +843,7 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs rArgs)
assert(nCharIndex -1);
mvCharDxs[nCharIndex-mnMinCharPos] += nOffset;
// adjust char dxs for rest of characters in cluster
-while (++nCharIndex
static_castint(mvGlyph2Char.size()))
+while (++nCharIndex - mnMinCharPos
static_castint(mvChar2BaseGlyph.size()))
{
int nChar2Base =
mvChar2BaseGlyph[nCharIndex-mnMinCharPos];
if (nChar2Base == -1 || nChar2Base ==
static_castint(i))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - sw/source writerfilter/source
sw/source/core/layout/paintfrm.cxx | 44 ++---
writerfilter/source/dmapper/BorderHandler.cxx |2 -
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 18 --
3 files changed, 42 insertions(+), 22 deletions(-)
New commits:
commit c7524ab32f801910673da5c9c68669ada7c98769
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 16 15:35:49 2012 +0100
fdo#42750: delay painting borders until after subsidiary lines
With commit 0f0896c26fb260d1bbf31d7a886df3f61837f0f2, borders are drawn
immediately, but then the subsidiary lines are drawn over the borders,
hiding 1 twip wide borders completely.
Signed-off-by: Cédric Bosdonnat cedric.bosdonnat@free.fr
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 4de8650..3a93e47 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -119,6 +119,7 @@
#include drawinglayer/primitive2d/textlayoutdevice.hxx
#include svx/sdr/contact/objectcontacttools.hxx
#include svx/unoapi.hxx
+#include comphelper/sequenceasvector.hxx
#include basegfx/matrix/b2dhommatrix.hxx
#include basegfx/matrix/b2dhommatrixtools.hxx
#include basegfx/polygon/b2dpolygon.hxx
@@ -220,6 +221,22 @@ public:
inline void Ins( const SwRect rRect, const sal_uInt8 nSCol );
};
+class BorderLines
+{
+::comphelper::SequenceAsVector
+ ::drawinglayer::primitive2d::Primitive2DReference m_Lines;
+public:
+void AddBorderLine(
+::drawinglayer::primitive2d::Primitive2DReference const xLine)
+{
+m_Lines.push_back(xLine);
+}
+drawinglayer::primitive2d::Primitive2DSequence GetBorderLines() const
+{
+return m_Lines.getAsConstList();
+}
+};
+
//- End of classes for border lines --
static ViewShell *pGlobalShell = 0;
@@ -253,6 +270,7 @@ static double aEdgeScale = 0.5;
// be compared with pLines before the work in order to avoid help lines
// to hide borders.
// bTablines is sal_True during the Paint of a table.
+static BorderLines *g_pBorderLines = 0;
static SwLineRects *pLines = 0;
static SwSubsRects *pSubsLines = 0;
// global variable for sub-lines of body, header, footer, section and footnote
frames.
@@ -335,6 +353,7 @@ class SwSavePaintStatics
SwFlyFrm *pSRetoucheFly,
*pSRetoucheFly2,
*pSFlyOnlyDraw;
+BorderLines*pBLines;
SwLineRects*pSLines;
SwSubsRects*pSSubsLines;
SwSubsRects*pSSpecSubsLines;
@@ -360,6 +379,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
pSRetoucheFly ( pRetoucheFly ),
pSRetoucheFly2 ( pRetoucheFly2 ),
pSFlyOnlyDraw ( pFlyOnlyDraw ),
+pBLines ( g_pBorderLines),
pSLines ( pLines),
pSSubsLines ( pSubsLines),
pSSpecSubsLines ( pSpecSubsLines),
@@ -384,6 +404,7 @@ SwSavePaintStatics::SwSavePaintStatics() :
aScaleX = aScaleY = 1.0;
aMinDistScale = 0.73;
aEdgeScale = 0.5;
+g_pBorderLines = 0;
pLines = 0;
pSubsLines = 0;
pSpecSubsLines = 0L;
@@ -398,6 +419,7 @@ SwSavePaintStatics::~SwSavePaintStatics()
pRetoucheFly = pSRetoucheFly;
pRetoucheFly2 = pSRetoucheFly2;
pFlyOnlyDraw = pSFlyOnlyDraw;
+g_pBorderLines = pBLines;
pLines = pSLines;
pSubsLines = pSSubsLines;
pSpecSubsLines = pSSpecSubsLines;
@@ -2888,6 +2910,7 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
pSubsLines = new SwSubsRects;
pSpecSubsLines = new SwSubsRects;
}
+g_pBorderLines = new BorderLines;
aPaintRect._Intersection( aRect );
@@ -3001,6 +3024,9 @@ SwRootFrm::Paint(SwRect const rRect, SwPrintData
const*const pPrintData) const
DELETEZ( pSubsLines );
DELETEZ( pSpecSubsLines );
}
+// fdo#42750: delay painting these until after subsidiary lines
+ProcessPrimitives(g_pBorderLines-GetBorderLines());
+DELETEZ(g_pBorderLines);
pVout-Leave();
// #i68597#
@@ -4509,11 +4535,8 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
::lcl_SubTopBottom( aRect, rBox, _rAttrs, _rFrm, _rRectFn,
bPrtOutputDev );
}
-// TODO Postpone the processing of the primitives
if ( lcl_GetLineWidth( pLeftRightBorder ) 0 )
{
-drawinglayer::primitive2d::Primitive2DSequence aSequence( 1 );
-
double nExtentIS = lcl_GetExtent( pTopBorder, NULL );
double nExtentIE = lcl_GetExtent( pBottomBorder, NULL );
double nExtentOS = lcl_GetExtent( NULL, pTopBorder );
@@ -4535,21 +4558,22 @@ void lcl_PaintLeftRightLine(
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx|2 +-
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 12 ++--
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx |1 +
3 files changed, 12 insertions(+), 3 deletions(-)
New commits:
commit 1523e93bfc9a5d96fa519c801e904aab82a2b4d4
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Mar 20 11:03:08 2012 +0100
fdo#47560 properly separate each new sorting column
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index c9c6092..1a18286 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2325,9 +2325,9 @@ namespace
OQueryController rController =
static_castOQueryController(_pView-getController());
EOrderDir eOrderDir;
-OTableFieldDescRef aDragLeft = new OTableFieldDesc();
for( sal_uInt32 i=0 ; ipNode-count() ; i++ )
{
+OTableFieldDescRef aDragLeft = new OTableFieldDesc();
eOrderDir = ORDER_ASC;
::connectivity::OSQLParseNode* pChild = pNode-getChild( i );
commit 7e0be5ebd688a5e8c2faa8f097f104c89139efeb
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Mar 20 11:01:12 2012 +0100
fdo#47370 properly duplicate (invisible) out-of-order sort columns
Keep track of position of previous sorting column and use it to decide
whether to duplicate invisible new sort column
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index d13d5f9..177313c 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -68,6 +68,7 @@ const String g_strZero = String::CreateFromAscii(0);
#define CHECKBOX_SIZE 10
#define HANDLE_ID0
#define HANDLE_COLUMN_WITDH 70
+#define SORT_COLUMN_NONE0x
//
-
namespace
@@ -113,6 +114,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent )
BROWSER_HIDECURSOR | BROWSER_HLINESFULL |
BROWSER_VLINESFULL )
,m_aFunctionStrings(ModuleRes(STR_QUERY_FUNCTIONS))
,m_nVisibleCount(0)
+ ,m_nLastSortColumn(SORT_COLUMN_NONE)
,m_bOrderByUnRelated(sal_True)
,m_bGroupByUnRelated(sal_True)
,m_bStopTimer(sal_False)
@@ -418,6 +420,7 @@ void OSelectionBrowseBox::ClearAll()
aIter = getFields().rbegin();
}
}
+m_nLastSortColumn = SORT_COLUMN_NONE;
SetUpdateMode(sal_True);
}
//--
@@ -1873,11 +1876,14 @@ void OSelectionBrowseBox::AddCondition( const
OTableFieldDescRef rInfo, const S
//--
void OSelectionBrowseBox::AddOrder( const OTableFieldDescRef rInfo, const
EOrderDir eDir, sal_uInt32 _nCurrentPos)
{
+if (_nCurrentPos == 0)
+m_nLastSortColumn = SORT_COLUMN_NONE;
+
Reference XConnection xConnection =
static_castOQueryController(getDesignView()-getController()).getConnection();
if(!xConnection.is())
return;
DBG_CHKTHIS(OSelectionBrowseBox,NULL);
-OSL_ENSURE(!rInfo-IsEmpty(),AddOrder:: OTableFieldDescRef sollte nicht
Empty sein!);
+OSL_ENSURE(!rInfo-IsEmpty(),AddOrder:: OTableFieldDescRef should not be
Empty!);
OTableFieldDescRef pEntry;
ReferenceXDatabaseMetaData xMeta = xConnection-getMetaData();
::comphelper::UStringMixEqual bCase(xMeta.is()
xMeta-supportsMixedCaseQuotedIdentifiers());
@@ -1896,7 +1902,7 @@ void OSelectionBrowseBox::AddOrder( const
OTableFieldDescRef rInfo, const EOrde
bCase(aAlias,rInfo-GetAlias()))
{
sal_uInt32 nPos = aIter - rFields.begin();
-bAppend = _nCurrentPos nPos;
+bAppend = (m_nLastSortColumn != SORT_COLUMN_NONE) (nPos =
m_nLastSortColumn);
if ( bAppend )
aIter = rFields.end();
else
@@ -1904,6 +1910,7 @@ void OSelectionBrowseBox::AddOrder( const
OTableFieldDescRef rInfo, const EOrde
if ( !m_bOrderByUnRelated )
pEntry-SetVisible(sal_True);
pEntry-SetOrderDir( eDir );
+m_nLastSortColumn = nPos;
}
break;
}
@@ -1914,6 +1921,7 @@ void OSelectionBrowseBox::AddOrder( const
OTableFieldDescRef rInfo, const EOrde
OTableFieldDescRef pTmp = InsertField(rInfo, BROWSER_INVALIDID,
sal_False, sal_False );
if(pTmp.is())
{
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/unx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 9876424a32439fb81a93f97900dda078c659c5e1
Author: David Bolen db3l@gmail.com
Date: Tue Mar 20 12:46:21 2012 +0100
Missing sub-menu arrows with 3.5.x and GTK 2.15
Signed-off-by: Michael Meeks michael.me...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 686c784..75e3c94 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1052,13 +1052,21 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
gint arrow_size;
gint arrow_extent;
guint horizontal_padding;
-gfloat arrow_scaling;
+gfloat arrow_scaling = 0.4; // Default for early GTK versions
gtk_widget_style_get( widget,
horizontal-padding, horizontal_padding,
- arrow-scaling, arrow_scaling,
NULL );
+// Use arrow-scaling property if available (2.15+), avoid warning
otherwise
+if ( gtk_widget_class_find_style_property( GTK_WIDGET_GET_CLASS(
widget ),
+ arrow-scaling ) )
+{
+gtk_widget_style_get( widget,
+ arrow-scaling, arrow_scaling,
+ NULL );
+}
+
child = GTK_BIN( widget )-child;
context = gtk_widget_get_pango_context( child );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - icu/icu4c-parallel-buid.patch icu/makefile.mk
icu/icu4c-parallel-buid.patch | 20 icu/makefile.mk |3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) New commits: commit 21229eeab92f5d84ae2d5fd7b7a83abc67ab1b4a Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Sat Mar 17 09:21:11 2012 +0100 fix icu parallel build (cherry picked from commit ff5a80024aab426d03394ad0b4da8067028097ff) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/icu/icu4c-parallel-buid.patch b/icu/icu4c-parallel-buid.patch new file mode 100644 index 000..3f33869 --- /dev/null +++ b/icu/icu4c-parallel-buid.patch @@ -0,0 +1,20 @@ +--- misc/build/icu/source/extra/uconv/Makefile.in.sav 2010-09-29 20:37:14.0 +0200 misc/build/icu/source/extra/uconv/Makefile.in 2011-10-19 01:12:22.0 +0200 +@@ -147,7 +147,7 @@ $(UCONVMSG_LIB): resfiles + endif + + +-package-resfiles: $(RESDIR)/$(RESDIR).lst pkgdata.inc ++package-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc + $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst + + $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk +@@ -159,7 +159,7 @@ $(RESDIR)/$(RESDIR).lst: Makefile $(srcd + + # no install for static mode + ifneq ($(UCONVMSG_MODE),static) +-install-resfiles: $(RESFILES) ++install-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc + $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR) + $(INVOKE) $(TOOLBINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst + else diff --git a/icu/makefile.mk b/icu/makefile.mk index 338333c..aaf8bf2 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -54,7 +54,8 @@ PATCH_FILES=\ icu4c-escapespace.patch \ icu4c-strict-c.patch \ CVE-2011-4599.patch \ -arm-assembler.patch +arm-assembler.patch \ +icu4c-parallel-buid.patch .IF $(OS)==ANDROID PATCH_FILES+=\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice
instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt|
3 ---
instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt |
3 ---
instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt|
3 ---
instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt |
3 ---
instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt |
5 -
instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt |
5 -
6 files changed, 22 deletions(-)
New commits:
commit 638f45f5a6ed26880fd8a53521b1f1be63ed0d0f
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 13:06:11 2012 +0100
remove unused BrOffice files
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
deleted file mode 100644
index cc1c303..000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{1552EC17-8CE9-4E58-A009-991468B8E806} # OOo UpgradeCode
\ No newline at end of file
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
deleted file mode 100644
index daf4927..000
---
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{D8B206B8-6822-48C2-A799-E35BFD585035} # OOo UpgradeCode
\ No newline at end of file
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
deleted file mode 100644
index cc1c303..000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{1552EC17-8CE9-4E58-A009-991468B8E806} # OOo UpgradeCode
\ No newline at end of file
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
deleted file mode 100644
index daf4927..000
---
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{D8B206B8-6822-48C2-A799-E35BFD585035} # OOo UpgradeCode
\ No newline at end of file
diff --git
a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 43fe6eb..000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[PRODUCTCODE]
-en-US = {98DE3411-B458-4E3C-B9D8-CA2D5667C22A}
-
-[UPGRADECODE]
-en-US = {1552EC17-8CE9-4E58-A009-991468B8E806}
diff --git
a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
deleted file mode 100644
index ddf30c1..000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[PRODUCTCODE]
-en-US = {0BC79FED-8EB6-4308-8150-D756BEC28383}
-
-[UPGRADECODE]
-en-US = {D8B206B8-6822-48C2-A799-E35BFD585035}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source
sc/source/ui/docshell/docsh.cxx |4
sc/source/ui/inc/docfunc.hxx | 251 ---
sc/source/ui/unoobj/cellsuno.cxx |6
3 files changed, 135 insertions(+), 126 deletions(-)
New commits:
commit 7bc643779225cce42cfe99aea730b5ec7c9f0bd1
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 20 12:22:05 2012 +
virtualise the ScDocFunc to allow interposing some magic
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 88bad72..ab5dcd9 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2538,7 +2538,7 @@ ScDocShell::ScDocShell( const ScDocShell rShell ) :
bIsInplace = rShell.bIsInplace;
-pDocFunc = new ScDocFunc(*this);
+pDocFunc = new ScDocFuncDirect(*this);
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
@@ -2585,7 +2585,7 @@ ScDocShell::ScDocShell( const sal_uInt64
i_nSfxCreationFlags ) :
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
-pDocFunc = new ScDocFunc(*this);
+pDocFunc = new ScDocFuncDirect(*this);
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index a2e6fd2..e7f6b4d 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -60,147 +60,156 @@ class ScDocFunc
private:
ScDocShellrDocShell;
-sal_BoolAdjustRowHeight( const ScRange rRange, sal_Bool
bPaint = true );
+sal_BoolAdjustRowHeight( const ScRange rRange, sal_Bool bPaint =
true );
voidCreateOneName( ScRangeName rList,
SCCOL nPosX, SCROW nPosY, SCTAB nTab,
SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2,
sal_Bool rCancel, sal_Bool bApi );
voidNotifyInputHandler( const ScAddress rPos );
+protected:
+ScDocFunc( ScDocShell rDocSh ): rDocShell(rDocSh) {}
public:
-ScDocFunc( ScDocShell rDocSh ): rDocShell(rDocSh) {}
-~ScDocFunc() {}
+virtual ~ScDocFunc() {}
DECL_LINK( NotifyDrawUndo, SdrUndoAction* );
-sal_BoolDetectiveAddPred(const ScAddress rPos);
-sal_BoolDetectiveDelPred(const ScAddress rPos);
-sal_BoolDetectiveAddSucc(const ScAddress rPos);
-sal_BoolDetectiveDelSucc(const ScAddress rPos);
-sal_BoolDetectiveAddError(const ScAddress rPos);
-sal_BoolDetectiveMarkInvalid(SCTAB nTab);
-sal_BoolDetectiveDelAll(SCTAB nTab);
-sal_BoolDetectiveRefresh(sal_Bool bAutomatic = false);
-voidDetectiveCollectAllPreds(const ScRangeList rSrcRanges,
::std::vectorScTokenRef rRefTokens);
-voidDetectiveCollectAllSuccs(const ScRangeList rSrcRanges,
::std::vectorScTokenRef rRefTokens);
-
-sal_BoolDeleteContents( const ScMarkData rMark, sal_uInt16
nFlags,
-sal_Bool bRecord, sal_Bool bApi );
-
-sal_BoolTransliterateText( const ScMarkData rMark, sal_Int32
nType,
-sal_Bool bRecord, sal_Bool bApi );
-
-sal_BoolSetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi );
-sal_BoolPutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi );
-sal_BoolPutData( const ScAddress rPos, ScEditEngineDefaulter
rEngine,
-sal_Bool bInterpret, sal_Bool bApi );
-sal_BoolSetCellText( const ScAddress rPos, const String
rText,
-sal_Bool bInterpret, sal_Bool bEnglish,
sal_Bool bApi,
-const String rFormulaNmsp,
-const formula::FormulaGrammar::Grammar
eGrammar );
-
-// creates a new cell for use with PutCell
-ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
-const String rFormulaNmsp, const
formula::FormulaGrammar::Grammar eGrammar,
-short* pRetFormatType = NULL );
-
-boolShowNote( const ScAddress rPos, bool bShow = true );
-inline bool HideNote( const ScAddress rPos ) { return ShowNote( rPos,
false ); }
-
-boolSetNoteText( const ScAddress rPos, const String
rNoteText, sal_Bool bApi );
-boolReplaceNote( const ScAddress rPos, const String
rNoteText, const String* pAuthor, const String* pDate, sal_Bool bApi );
-
-sal_BoolApplyAttributes( const ScMarkData rMark, const
ScPatternAttr rPattern,
-sal_Bool bRecord, sal_Bool bApi );
[Libreoffice-commits] .: instsetoo_native/inc_openoffice solenv/bin
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 17 --
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt | 10 -
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3
instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt |1
solenv/bin/make_installer.pl | 14 -
solenv/bin/modules/installer/windows/idtglobal.pm | 72
--
6 files changed, 117 deletions(-)
New commits:
commit 0778689797eda887dd2f73fbcbed6b478633e734
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 13:26:51 2012 +0100
remove unused Language selection dialog from MSI
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index a7cc609..8d351fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -646,12 +646,6 @@ en-US = Cancel
[OOO_CONTROL_266]
en-US = Next
-[OOO_CONTROL_267]
-en-US = Please select the product language for [ProductName].
-
-[OOO_CONTROL_268]
-en-US = {MSSansBold8}Language Selection
-
[OOO_CONTROL_269]
en-US = Repair or remove the program.
@@ -723,14 +717,3 @@ en-US = Create a start link on desktop
[OOO_CONTROL_320]
en-US = Remove all older product versions
-
-[OOO_CONTROL_LANG_1033]
-en-US = English
-
-[OOO_CONTROL_LANG_1031]
-en-US = German
-
-[OOO_CONTROL_LANG_1034]
-en-US = Spanish
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index bd48e9a..a3a8347 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -192,16 +192,6 @@ InstallWelcome TextLine2 Text135 55
228 45 65539 OOO_CONTROL_127
LanguageInfo1 IconIcon15 15 24 24 5242881
CautionIco
LanguageInfo1 OK PushButton 100 57 66 17 3
OOO_CONTROL_10
LanguageInfo1 TextText48 15 194 30 3
OOO_CONTROL_317
-LanguageSelection BackPushButton 164 243 66 17
3 OOO_CONTROL_122 CheckBox1
-LanguageSelection Banner Bitmap 297 0 77 44 1
BannerBmp
-LanguageSelection BannerLine Line0 44 374 0
1
-LanguageSelection Branding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
-LanguageSelection Branding2 Text3 228 88 13
65537 [ProductName]
-LanguageSelection Cancel PushButton 301 243 66 17
3 OOO_CONTROL_131 Back
-LanguageSelection DlgDesc Text21 23 292 25 65539
OOO_CONTROL_267
-LanguageSelection DlgLine Line90 234 284 0 1
-LanguageSelection DlgTitleText13 6 292 25
65539 OOO_CONTROL_268
-LanguageSelection NextPushButton 230 243 66 17
3 OOO_CONTROL_134 Cancel
LicenseAgreement Agree RadioButtonGroup8 190 330
40 3 AgreeToLicense Back
LicenseAgreement BackPushButton 164 243 66 17
3 OOO_CONTROL_128 Next
LicenseAgreement Banner Bitmap 297 0 77 44 1
BannerBmp
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 56bf6b9..fb788fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -71,9 +71,6 @@ InstallWelcomeCancel SpawnDialog CancelSetup
1 0
InstallWelcome NextNewDialog LicenseAgreementHIDEEULA 1 0
InstallWelcome NextNewDialog CustomerInformation HIDEEULA = 10
LanguageInfo1 OK EndDialog Return 1 0
-LanguageSelection BackNewDialog CustomerInformation 1
1
-LanguageSelection Cancel SpawnDialog CancelSetup 1 1
-LanguageSelection NextNewDialog SetupType 1 1
LicenseAgreement BackNewDialog InstallWelcome 1 0
LicenseAgreement Cancel SpawnDialog CancelSetup 1 0
LicenseAgreement NextNewDialog CustomerInformation
[Libreoffice-commits] .: 3 commits - binfilter/bf_svtools binfilter/bf_sw binfilter/inc
binfilter/bf_svtools/source/misc/tl_strucvt.cxx| 12
binfilter/bf_svtools/source/misc/tl_tustring.cxx |9
binfilter/bf_sw/source/filter/writer/sw_writer.cxx | 38 --
binfilter/inc/bf_svtools/svicnvw.hxx | 299 -
binfilter/inc/bf_sw/shellio.hxx|3
binfilter/inc/bf_tools/string.hxx |3
6 files changed, 364 deletions(-)
New commits:
commit 9034ab5003413c7457e883e50fc71cec649a2783
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 20 11:37:53 2012 +
drop unused methods
diff --git a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
index 00d2869..f8b4fe1 100644
--- a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
@@ -144,18 +144,6 @@ UniString UniString::Assign( const rtl::OUString rStr )
return *this;
}
-UniString UniString::intern() const
-{
-UniString aStr;
-
-rtl_uString_intern( reinterpret_castrtl_uString **(aStr.mpData),
-(rtl_uString *)(mpData) );
-
-return aStr;
-}
-
-// ===
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index e66b750..58036d5 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -125,15 +125,6 @@ sal_Int64 UniString::ToInt64() const
// ---
-float UniString::ToFloat() const
-{
-DBG_CHKTHIS( UniString, DbgCheckUniString );
-
-return rtl_ustr_toFloat( mpData-maStr );
-}
-
-// ---
-
double UniString::ToDouble() const
{
DBG_CHKTHIS( UniString, DbgCheckUniString );
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 00b9958..b421f5b 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -372,8 +372,6 @@ public:
return *(reinterpret_cast const ::UniString* (this));
}
-UniString intern() const;
-
static UniStringCreateFromAscii( const sal_Char* pAsciiStr );
static UniStringCreateFromAscii( const sal_Char* pAsciiStr, xub_StrLen
nLen );
@@ -382,7 +380,6 @@ public:
static const UniString EmptyString();
sal_Int32 ToInt32() const;
sal_Int64 ToInt64() const;
-float ToFloat() const;
double ToDouble() const;
UniString Assign( const UniString rStr );
commit 90a97aea3fa5cc27009415d85802d9e428d4a9eb
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 16 23:44:45 2012 +
delete un-included header file
diff --git a/binfilter/inc/bf_svtools/svicnvw.hxx
b/binfilter/inc/bf_svtools/svicnvw.hxx
deleted file mode 100644
index 32e05d6..000
--- a/binfilter/inc/bf_svtools/svicnvw.hxx
+++ /dev/null
@@ -1,299 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _SVICNVW_HXX
-#define _SVICNVW_HXX
-
-#include bf_svtools/bf_solar.h
-
-#include vcl/image.hxx
-
-#include bf_svtools/svlbox.hxx
-
-namespace binfilter
-{
-
-class SvPtrarr;
-class SvImpIconView;
-class SvLBoxEntry;
-class SvLBoxItem;
-class SvLBoxString;
-class SvLBoxContextBmp;
-
-#define WB_ICON 0x0001
-#define WB_NAME 0x0002
-#define WB_TEXT 0x0004
-#define WB_FLOW 0x0008
-
-#define ICNVW_FLAG_POS_LOCKED 0x0001
-#define ICNVW_FLAG_USER10x1000
-#define ICNVW_FLAG_USER20x2000
-#define ICNVW_FLAG_USER30x4000
[Libreoffice-commits] .: connectivity/source unusedcode.easy
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx |7 -
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx |1
connectivity/source/drivers/evoab2/NStatement.cxx| 12 --
connectivity/source/drivers/evoab2/NStatement.hxx|1
connectivity/source/drivers/file/FNoException.cxx|5 -
connectivity/source/drivers/file/fanalyzer.cxx | 61 ---
connectivity/source/inc/file/fanalyzer.hxx |2
unusedcode.easy |4
8 files changed, 93 deletions(-)
New commits:
commit 33a805ebcf1fa1e86854a0af4f90834a31e4ec0d
Author: Santiago Martinez smvar...@gmail.com
Date: Fri Mar 16 20:12:53 2012 +0100
Remove unused code as listed in unusedcode.easy
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 929150a..0a89e58 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -147,13 +147,6 @@ namespace connectivity
}
-guint
-getFieldCount()
-{
-initFields();
-return nFields;
-}
-
const ColumnProperty *
getField(guint n)
{
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 45f93b9..2cb7207 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -64,7 +64,6 @@ namespace connectivity
const SplitEvoColumns* get_evo_addr();
const ColumnProperty *getField(guint n);
-guint getFieldCount() ;
GType getGFieldType(guint nCol) ;
sal_Int32 getFieldType(guint nCol) ;
rtl::OUString getFieldTypeName(guint nCol) ;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 36786a4..81beb26 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -163,18 +163,6 @@ void SAL_CALL OCommonStatement::close( )
throw(SQLException, RuntimeException)
}
// -
-void OCommonStatement::reset() throw (SQLException)
-{
-::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
-
-
-clearWarnings ();
-
-if (m_xResultSet.get().is())
-clearMyResultSet();
-}
-
void OCommonStatement::clearMyResultSet () throw (SQLException)
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx
b/connectivity/source/drivers/evoab2/NStatement.hxx
index d12956e..3d6d923 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -190,7 +190,6 @@ namespace connectivity
virtual ~OCommonStatement();
protected:
-void reset () throw( ::com::sun::star::sdbc::SQLException);
void clearMyResultSet () throw(
::com::sun::star::sdbc::SQLException);
void parseSql( const ::rtl::OUString sql, QueryData
_out_rQueryData );
EBookQuery *whereAnalysis( const OSQLParseNode* parseTree );
diff --git a/connectivity/source/drivers/file/FNoException.cxx
b/connectivity/source/drivers/file/FNoException.cxx
index 8090295..67599cb 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -66,11 +66,6 @@ void OPredicateCompiler::Clean()
m_aCodeList.clear();
}
//
-
-void OSQLAnalyzer::clean()
-{
-m_aCompiler-Clean();
-}
-//
-
void OSQLAnalyzer::bindParameterRow(OValueRefRow _pRow)
{
OCodeList rCodeList= m_aCompiler-m_aCodeList;
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx
b/connectivity/source/drivers/file/fanalyzer.cxx
index d5f327d..fcaba19 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -212,67 +212,6 @@ void OSQLAnalyzer::bindSelectRow(const OValueRefRow _pRow)
return pKeySet;
}
-//--
-void OSQLAnalyzer::describeParam(::rtl::ReferenceOSQLColumns
rParameterColumns)
-{
-OCodeList rCodeList= m_aCompiler-m_aCodeList;
-OCodeStack aCodeStack;
-
-if (!rCodeList.size())
-return; // no predicate
-if (!rParameterColumns-get().size())
-return; // no parameters
-
-// Create columns, that have a more precise description for the included
-::rtl::ReferenceOSQLColumns aNewParamColumns =
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/win
vcl/win/source/gdi/winlayout.cxx | 22 --
1 file changed, 22 deletions(-)
New commits:
commit 88907415f03b4566d0ed87e98e372dd5c3c74e50
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 20 13:06:27 2012 +
Resolves: fdo#46923 fdo#46750 revert thai glyph fallback
Revert fdo#33090 better glyph fallback under windows for complex text
This reverts commit e601c32661735e9fd78def7ee11bfe21279cca71.
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 7b08ee8..c191149 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1855,28 +1855,6 @@ int UniscribeLayout::GetNextGlyphs( int nLen,
sal_GlyphId* pGlyphs, Point rPos,
const VisualItem rVI = mpVisualItems[ nItem ];
if( rVI.IsEmpty() )
continue;
-
-//Resolves: fdo#33090 Ensure that all glyph slots, even if 0-width
-//or empty due to combining chars etc, map back to a character
-//position so that iterating over glyph slots one at a time for
-//glyph fallback can keep context as to what characters are the
-//inputs that caused a missing glyph in a given font.
-{
-int dir = 1;
-int out = rVI.mnMinCharPos;
-if (rVI.IsRTL())
-{
-dir = -1;
-out = rVI.mnEndCharPos-1;
-}
-for(c = rVI.mnMinCharPos; c rVI.mnEndCharPos; ++c)
-{
-int i = out;
-mpGlyphs2Chars[i] = c;
-out += dir;
-}
-}
-
// calculate the mapping by using mpLogClusters[]
// mpGlyphs2Chars[] should obey the logical order
// = reversing the loop does this by overwriting higher logicals
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 --- instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt|2 -- instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt |2 -- instsetoo_native/inc_ure/windows/msi_templates/Control.idt |2 -- instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt |2 -- 11 files changed, 23 deletions(-) New commits: commit dd27492325a073b0a72d751635226cf4130af474 Author: Andras Timar ati...@suse.com Date: Tue Mar 20 14:05:36 2012 +0100 LibreOffice installer does not need Serial number diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt index e5be5e4..92b5130 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt @@ -58,8 +58,6 @@ CustomerInformation NameEditEdit21 63 237 17 3 USERNAMEOOO_CONTROL_41 Company CustomerInformationNameLabel Text21 52 75 10 3 OOO_CONTROL_42 NameEdit CustomerInformationNextPushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel CustomerInformationRadioGroup RadioButtonGroup63 170 300 50 3 ApplicationUsersBack -CustomerInformationSerialLabel Text21 127 109 10 2 OOO_CONTROL_45 SerialNumber -CustomerInformationSerialNumberMaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup CustomSetupBackPushButton 164 243 66 17 3 OOO_CONTROL_46 Next CustomSetupBanner Bitmap 297 0 77 44 1 BannerBmp CustomSetupBannerLine Line0 44 374 0 1 diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt index 6f6e3cb..f3a286b 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt @@ -7,8 +7,6 @@ CustomerInformation DlgRadioGroupText Hide Version9X CustomerInformationRadioGroup HideNOT Privileged CustomerInformationRadioGroup HideProductState 0 CustomerInformationRadioGroup HideVersion9X -CustomerInformationSerialLabel ShowSERIALNUMSHOW -CustomerInformationSerialNumberShowSERIALNUMSHOW CustomSetupChangeFolderHideInstalled CustomSetupDetails HideInstalled CustomSetupInstallLabelHideInstalled diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt index e5be5e4..92b5130 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt @@ -58,8 +58,6 @@ CustomerInformation NameEditEdit21 63 237 17 3 USERNAMEOOO_CONTROL_41 Company CustomerInformationNameLabel Text21 52 75 10 3 OOO_CONTROL_42 NameEdit CustomerInformationNextPushButton 230 243 66 17 3 OOO_CONTROL_43 Cancel CustomerInformationRadioGroup RadioButtonGroup63 170 300 50 3 ApplicationUsersBack -CustomerInformationSerialLabel Text21 127 109 10 2 OOO_CONTROL_45 SerialNumber -CustomerInformationSerialNumberMaskedEdit 21 138 237 17 2 ISX_SERIALNUM RadioGroup CustomSetupBackPushButton 164 243 66 17 3 OOO_CONTROL_46 Next CustomSetupBanner Bitmap 297 0 77 44 1 BannerBmp CustomSetupBannerLine Line0 44 374 0 1 diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt
[Libreoffice-commits] .: sdext/source
sdext/source/minimizer/optimizerdialog.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9481eb32e76568fc675982479cc07c57c6a7cb39
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Mar 20 14:21:22 2012 +0100
cppcheck report: logical disjunction always evaluates to true
diff --git a/sdext/source/minimizer/optimizerdialog.cxx
b/sdext/source/minimizer/optimizerdialog.cxx
index a7076a0..78afa98 100644
--- a/sdext/source/minimizer/optimizerdialog.cxx
+++ b/sdext/source/minimizer/optimizerdialog.cxx
@@ -273,7 +273,7 @@ sal_Bool OptimizerDialog::execute()
void OptimizerDialog::SwitchPage( sal_Int16 nNewStep )
{
-if ( ( nNewStep != mnCurrentStep ) ( ( nNewStep = MAX_STEP ) || (
nNewStep = 0 ) ) )
+if ( ( nNewStep != mnCurrentStep ) ( nNewStep = MAX_STEP ) (
nNewStep = 0 ) )
{
sal_Int16 nOldStep = mnCurrentStep;
if ( nNewStep == 0 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5e7dab83e6425a2e2e8bf9f4cf496669aa6713f6 Author: Andras Timar ati...@suse.com Date: Tue Mar 20 14:28:03 2012 +0100 amended UI text in MSI diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 90d331e..194da51 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -704,10 +704,10 @@ en-US = Install [ProductName] to: en-US = If you are just trying out [ProductName], you probably don't want this to happen, so leave the boxes unchecked. [OOO_CONTROL_317] -en-US = No languages have been selected for installation. Click OK to select one or more languages for installation. +en-US = No languages have been selected for installation. Click OK, then select one or more languages for installation. [OOO_CONTROL_318] -en-US = No applications have been selected for installation. Click OK to select one or more applications for installation. +en-US = No applications have been selected for installation. Click OK, then select one or more applications for installation. [OOO_CONTROL_319] en-US = Create a start link on desktop ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - libcroco/makefile.mk librsvg/makefile.mk redland/rasqal redland/redland
libcroco/makefile.mk|2 +- librsvg/makefile.mk | 16 +--- redland/rasqal/makefile.mk |4 redland/redland/makefile.mk |4 4 files changed, 22 insertions(+), 4 deletions(-) New commits: commit de01d3c6d3f9a617d0a7d5b95305c7c3b68d39d6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 10:52:50 2012 +0100 Make redland build on Mac with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index 45dbba6..6f356db 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -116,6 +116,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .ENDIF .ENDIF # $(SYSBASE)!= +.IF $(OS)==MACOSX $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) LDFLAGS+:=$(EXTRA_LINKFLAGS) XSLTLIB!:=$(XSLTLIB) # expand dmake variables for xslt-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index 0ce48c4..4644611 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -118,6 +118,10 @@ LDFLAGS+:=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl .IF $(OS)==MACOSX LDFLAGS+:=-Wl,-dylib_file,@loader_path/libraptor.1.dylib:$(PWD)/$(LB)/libraptor.1.dylib +.IF $(SYSTEM_LIBXML) != YES +LDFLAGS+:=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + .ENDIF CPPFLAGS+:=$(EXTRA_CDEFS) $(EXTRA_CFLAGS) commit dae9dd4cff2659abb51d0de14c5bb5a734a20aa1 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Feb 27 09:24:42 2012 +0100 Make librsvg link with internal libxml Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/librsvg/makefile.mk b/librsvg/makefile.mk index 1348a04..2383167 100755 --- a/librsvg/makefile.mk +++ b/librsvg/makefile.mk @@ -57,14 +57,24 @@ PATCH_FILES=librsvg-2.32.1.patch LIBXML_LIBS=-lxml2 .ENDIF +.IF $(SYSTEM_LIBXML) == YES +my_libxml2_cflags=$(LIBXML_CFLAGS) +my_libxml2_libs=$(LIBXML_LIBS) +my_dylib_file= +.ELSE +my_libxml2_cflags=-I$(SOLARINCDIR)/external/libxml +my_libxml2_libs=-L$(SOLARLIBDIR) -lxml2 +my_dylib_file=-Wl,-dylib_file,@loader_path/../ure-link/lib/libxml2.2.dylib:$(SOLARLIBDIR)/libxml2.2.dylib +.ENDIF + CONFIGURE_LDFLAGS=-L$(SOLARLIBDIR) $(eq,$(OS),MACOSX $(EXTRA_LINKFLAGS) $(NULL)) CONFIGURE_DIR= CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) ./configure \ --prefix=/@.__$(EXTRPATH) CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ --disable-pixbuf-loader --disable-dependency-tracking $(eq,$(VERBOSE),$(NULL) --enable-silent-rules --disable-silent-rules) \ - LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(LIBXML_CFLAGS) \ - LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(LIBXML_LIBS) -lcairo -lintl \ + LIBRSVG_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo $(my_libxml2_cflags) \ + LIBRSVG_LIBS=-L$(SOLARLIBDIR) -lgdk_pixbuf-2.0 -lpango-1.0 -lpangocairo-1.0 -lgthread-2.0 -lgio-2.0 -lgmodule-2.0 -lgobject-2.0 -lglib-2.0 $(my_libxml2_libs) -lcairo -lintl \ GDK_PIXBUF_CFLAGS=-I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 \ GDK_PIXBUF_LIBS=-lgdk_pixbuf-2.0 \ GTHREAD_CFLAGS=-I$(SOLARINCDIR)/external/glib-2.0 \ @@ -72,7 +82,7 @@ CONFIGURE_FLAGS=--disable-gtk-theme --disable-tools --with-croco --with-svgz \ LIBCROCO_CFLAGS=-I$(SOLARINCDIR)/external/libcroco-0.6 \ LIBCROCO_LIBS=-lcroco-0.6 \ CFLAGS=$(ARCH_FLAGS) $(EXTRA_CFLAGS) -I$(SOLARINCDIR)/external -I$(SOLARINCDIR)/external/glib-2.0 -I$(SOLARINCDIR)/external/gdk-pixbuf-2.0 -I$(SOLARINCDIR)/external/pango-1.0 -I$(SOLARINCDIR)/cairo \ - LDFLAGS=$(CONFIGURE_LDFLAGS) + LDFLAGS=$(CONFIGURE_LDFLAGS) $(my_dylib_file) CONFIGURE_FLAGS+= CPPFLAGS=$(ARCH_FLAGS) $(EXTRA_CDEFS) commit baeb77da20b7f9df7153b42f08f5aec57f72 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Sun Feb 26 00:02:28 2012 +0100 Fix libcroco build against internal libxml2 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/libcroco/makefile.mk b/libcroco/makefile.mk index 40586d5..36aba58 100644 --- a/libcroco/makefile.mk +++ b/libcroco/makefile.mk @@ -55,7 +55,7 @@ CONFIGURE_DIR= my_libxml2_cflags=$(LIBXML_CFLAGS) my_libxml2_libs=$(LIBXML_LIBS) .ELSE
[Libreoffice-commits] .: 3 commits - oox/inc oox/source sc/source unusedcode.easy vcl/win
oox/inc/oox/dump/dumperbase.hxx |7 --
oox/inc/oox/dump/oledumper.hxx|5 -
oox/inc/oox/ole/vbacontrol.hxx|2
oox/source/dump/dumperbase.cxx| 15 -
oox/source/dump/oledumper.cxx |7 --
oox/source/ole/vbacontrol.cxx |5 -
sc/source/filter/inc/biffhelper.hxx |4 -
sc/source/filter/inc/biffoutputstream.hxx |8 ---
sc/source/filter/inc/drawingmanager.hxx |6 --
sc/source/filter/inc/formulabase.hxx |3 -
sc/source/filter/oox/biffhelper.cxx | 21 ---
sc/source/filter/oox/biffoutputstream.cxx | 14 -
sc/source/filter/oox/drawingmanager.cxx | 79 --
sc/source/filter/oox/formulabase.cxx |9 ---
unusedcode.easy | 14 -
vcl/win/source/gdi/winlayout.cxx |4 +
16 files changed, 3 insertions(+), 200 deletions(-)
New commits:
commit da8034199e840092cd80d498b3cdb9d8a4c350f0
Author: Petr Vorel petr.vo...@gmail.com
Date: Tue Mar 20 13:33:56 2012 +
remove unused code (oox, sc)
diff --git a/sc/source/filter/inc/biffhelper.hxx
b/sc/source/filter/inc/biffhelper.hxx
index be8303f..5f390fa 100644
--- a/sc/source/filter/inc/biffhelper.hxx
+++ b/sc/source/filter/inc/biffhelper.hxx
@@ -607,8 +607,6 @@ public:
/** Converts the passed packed number to a double. */
static double calcDoubleFromRk( sal_Int32 nRkValue );
-/** Converts the passed double to a packed number, returns true on
success. */
-static bool calcRkFromDouble( sal_Int32 ornRkValue, double fValue
);
/** Converts the passed BIFF error to a double containing the respective
Calc error code. */
static double calcDoubleFromError( sal_uInt8 nErrorCode );
@@ -616,8 +614,6 @@ public:
/** Returns a text encoding from an Windows code page.
@return The corresponding text encoding or RTL_TEXTENCODING_DONTKNOW.
*/
static rtl_TextEncoding calcTextEncodingFromCodePage( sal_uInt16 nCodePage
);
-/** Returns a Windows code page from a text encoding. */
-static sal_uInt16 calcCodePageFromTextEncoding( rtl_TextEncoding
eTextEnc );
// BIFF12 import --
diff --git a/sc/source/filter/inc/biffoutputstream.hxx
b/sc/source/filter/inc/biffoutputstream.hxx
index 75440e1..a38bfdf 100644
--- a/sc/source/filter/inc/biffoutputstream.hxx
+++ b/sc/source/filter/inc/biffoutputstream.hxx
@@ -87,7 +87,6 @@ private:
8224 bytes in BIFF8).
To start writing a record, call startRecord() with the record identifier.
-Each record must be closed by calling endRecord().
If some data exceeds the record size limit, a CONTINUE record will be
started automatically and the new data will be written to this record. If
@@ -99,18 +98,11 @@ private:
class BiffOutputStream : public BinaryOutputStream
{
public:
-explicitBiffOutputStream(
-BinaryOutputStream rOutStream,
-sal_uInt16 nMaxRecSize );
-
// record control -
/** Starts a new record. */
voidstartRecord( sal_uInt16 nRecId );
-/** Finishes the current record. Must be called for every started record.
*/
-voidendRecord();
-
/** Sets size of data portion in bytes. 0 or 1 means no portions are used.
*/
voidsetPortionSize( sal_uInt8 nSize );
diff --git a/sc/source/filter/inc/drawingmanager.hxx
b/sc/source/filter/inc/drawingmanager.hxx
index a7580a3..c597b03 100644
--- a/sc/source/filter/inc/drawingmanager.hxx
+++ b/sc/source/filter/inc/drawingmanager.hxx
@@ -125,8 +125,6 @@ public:
static BiffDrawingObjectRef importObjBiff4( const WorksheetHelper
rHelper, BiffInputStream rStrm );
/** Reads the BIFF5 OBJ record, returns a new drawing object. */
static BiffDrawingObjectRef importObjBiff5( const WorksheetHelper
rHelper, BiffInputStream rStrm );
-/** Reads the BIFF8 OBJ record, returns a new drawing object. */
-static BiffDrawingObjectRef importObjBiff8( const WorksheetHelper
rHelper, BiffInputStream rStrm );
/** Sets whether this is an area object (then its width and height must be
greater than 0). */
inline void setAreaObj( bool bAreaObj ) { mbAreaObj = bAreaObj; }
@@ -452,10 +450,6 @@ public:
const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape rxShape,
const ::com::sun::star::awt::Rectangle rShapeRect
) = 0;
-protected:
-/** Appends a new drawing object to the list of raw objects (without DFF
data). */
-voidappendRawObject( const BiffDrawingObjectRef
rxDrawingObj );
-
private:
typedef RefMap sal_uInt16, BiffDrawingObjectBase
BiffDrawingObjectMapById;
typedef ::std::vector
[Libreoffice-commits] .: sdext/source
sdext/source/presenter/PresenterWindowManager.cxx | 11 ---
sdext/source/presenter/PresenterWindowManager.hxx |2 --
2 files changed, 13 deletions(-)
New commits:
commit 591e0fc5e9e10853215ade7d0df397995fafbeac
Author: Christina Rossmanith chrrossman...@web.de
Date: Wed Mar 14 19:50:29 2012 +0100
Remove unused code
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx
b/sdext/source/presenter/PresenterWindowManager.cxx
index 5dceffc..d25358f 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -1168,17 +1168,6 @@ void PresenterWindowManager::Invalidate (void)
{
mpPresenterController-GetPaintManager()-Invalidate(mxParentWindow);
}
-
-Referenceawt::XWindow PresenterWindowManager::GetParentWindow (void) const
-{
-return mxParentWindow;
-}
-
-Referencerendering::XCanvas PresenterWindowManager::GetParentCanvas (void)
const
-{
-return mxParentCanvas;
-}
-
void PresenterWindowManager::Update (void)
{
mxClipPolygon = NULL;
diff --git a/sdext/source/presenter/PresenterWindowManager.hxx
b/sdext/source/presenter/PresenterWindowManager.hxx
index 3051c38..d2a5ae2 100644
--- a/sdext/source/presenter/PresenterWindowManager.hxx
+++ b/sdext/source/presenter/PresenterWindowManager.hxx
@@ -97,8 +97,6 @@ public:
const double nWidth,
const double nHeight);
void SetPaneBorderPainter (const
::rtl::ReferencePresenterPaneBorderPainter rPainter);
-css::uno::Referencecss::awt::XWindow GetParentWindow (void) const;
-css::uno::Referencecss::rendering::XCanvas GetParentCanvas (void) const;
void Update (void);
void Layout (void);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sdext/source unusedcode.easy
sdext/source/presenter/PresenterAnimation.cxx | 31 --
sdext/source/presenter/PresenterAnimation.hxx | 17 --
sdext/source/presenter/PresenterAnimator.cxx | 11 -
sdext/source/presenter/PresenterAnimator.hxx |8 --
unusedcode.easy |4 ---
5 files changed, 2 insertions(+), 69 deletions(-)
New commits:
commit fdd18639075f6ac7b3ec2ff735e7de2bdf550964
Author: Christina Rossmanith chrrossman...@web.de
Date: Tue Mar 20 13:51:48 2012 +
Remove unused code (sdext)
diff --git a/sdext/source/presenter/PresenterAnimation.cxx
b/sdext/source/presenter/PresenterAnimation.cxx
index cacf98d..b5c30ec 100644
--- a/sdext/source/presenter/PresenterAnimation.cxx
+++ b/sdext/source/presenter/PresenterAnimation.cxx
@@ -47,9 +47,7 @@ PresenterAnimation::PresenterAnimation (
const sal_uInt64 nStepDuration)
: mnStartTime(GetCurrentTime()+nStartDelay),
mnTotalDuration(nTotalDuration),
- mnStepDuration(nStepDuration),
- mpStartCallbacks(),
- mpEndCallbacks()
+ mnStepDuration(nStepDuration)
{
}
@@ -72,33 +70,6 @@ sal_uInt64 PresenterAnimation::GetStepDuration (void)
return mnStepDuration;
}
-void PresenterAnimation::AddEndCallback (const Callback rCallback)
-{
-if (mpEndCallbacks.get() == NULL)
-mpEndCallbacks.reset(new ::std::vectorCallback());
-mpEndCallbacks-push_back(rCallback);
-}
-
-void PresenterAnimation::RunStartCallbacks (void)
-{
-if (mpStartCallbacks.get() != NULL)
-{
-::std::vectorCallback::const_iterator iCallback;
-for (iCallback=mpStartCallbacks-begin();
iCallback!=mpStartCallbacks-end(); ++iCallback)
-(*iCallback)();
-}
-}
-
-void PresenterAnimation::RunEndCallbacks (void)
-{
-if (mpEndCallbacks.get() != NULL)
-{
-::std::vectorCallback::const_iterator iCallback;
-for (iCallback=mpEndCallbacks-begin();
iCallback!=mpEndCallbacks-end(); ++iCallback)
-(*iCallback)();
-}
-}
-
} } // end of namespace ::sdext::presenter
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterAnimation.hxx
b/sdext/source/presenter/PresenterAnimation.hxx
index fdd8de6..8c2ce42 100644
--- a/sdext/source/presenter/PresenterAnimation.hxx
+++ b/sdext/source/presenter/PresenterAnimation.hxx
@@ -83,11 +83,6 @@ public:
typedef ::boost::functionvoid(void) Callback;
-/** Add a callback that is executed after Run() is called for the last
-time.
-*/
-void AddEndCallback (const Callback rCallback);
-
/** Called with nProgress taking on values between 0 and 1.
@param nProgress
A value between 0 and 1.
@@ -96,22 +91,10 @@ public:
*/
virtual void Run (const double nProgress, const sal_uInt64 nCurrentTime) =
0;
-/** Called just before Run() is called for the first time to trigger the
-callbacks registered via the methodAddStartCallback()/method.
-*/
-void RunStartCallbacks (void);
-
-/** Called just after Run() is called for the last time to trigger the
-callbacks registered via the methodAddEndCallback()/method.
-*/
-void RunEndCallbacks (void);
-
private:
const sal_uInt64 mnStartTime;
const sal_uInt64 mnTotalDuration;
const sal_uInt64 mnStepDuration;
-::boost::scoped_ptrstd::vectorCallback mpStartCallbacks;
-::boost::scoped_ptrstd::vectorCallback mpEndCallbacks;
};
sal_uInt64 GetCurrentTime (void);
diff --git a/sdext/source/presenter/PresenterAnimator.cxx
b/sdext/source/presenter/PresenterAnimator.cxx
index 55c9fd5..a401c2a 100644
--- a/sdext/source/presenter/PresenterAnimator.cxx
+++ b/sdext/source/presenter/PresenterAnimator.cxx
@@ -52,14 +52,6 @@ PresenterAnimator::~PresenterAnimator (void)
PresenterTimer::CancelTask(mnCurrentTaskId);
}
-void PresenterAnimator::AddAnimation (const SharedPresenterAnimation
rpAnimation)
-{
-::osl::MutexGuard aGuard (m_aMutex);
-
-
maFutureAnimations.insert(AnimationList::value_type(rpAnimation-GetStartTime(),
rpAnimation));
-ScheduleNextRun();
-}
-
void PresenterAnimator::Process (void)
{
::osl::MutexGuard aGuard (m_aMutex);
@@ -96,8 +88,6 @@ void PresenterAnimator::Process (void)
AnimationList::value_type(
nCurrentTime + pAnimation-GetStepDuration(),
pAnimation));
-else
-pAnimation-RunEndCallbacks();
}
ScheduleNextRun();
@@ -111,7 +101,6 @@ void PresenterAnimator::ActivateAnimations (const
sal_uInt64 nCurrentTime)
SharedPresenterAnimation pAnimation
(maFutureAnimations.begin()-second);
maActiveAnimations.insert(*maFutureAnimations.begin());
maFutureAnimations.erase(maFutureAnimations.begin());
-pAnimation-RunStartCallbacks();
}
}
diff --git a/sdext/source/presenter/PresenterAnimator.hxx
[Libreoffice-commits] Changes to 'libreoffice-3-5-2'
New branch 'libreoffice-3-5-2' available with the following commits: commit eb08ded29064669f1d9d5d5285e56cd30e9300fb Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:08:23 2012 +0100 Branch libreoffice-3-5-2 This is 'libreoffice-3-5-2' - the stable branch for the 3.5.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-2'
New branch 'libreoffice-3-5-2' available with the following commits: commit 5b29dc26e78c12bc0f8cfa155c60174207d73d3f Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:08:23 2012 +0100 Branch libreoffice-3-5-2 This is 'libreoffice-3-5-2' - the stable branch for the 3.5.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-2'
New branch 'libreoffice-3-5-2' available with the following commits: commit 659e8738becf567ee2aa867f3dd5e32978885261 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 15:08:23 2012 +0100 Branch libreoffice-3-5-2 This is 'libreoffice-3-5-2' - the stable branch for the 3.5.2 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++---
solenv/inc/minor.mk |4 ++--
2 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit fb03509d32f79a668622961c7d8d5347f1c4bb0f
Author: Petr Mladek pmla...@suse.cz
Date: Tue Mar 20 15:12:48 2012 +0100
bump product version to 3.5.3-rc0+, release number to 300
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 2d32336..8fdbcf3 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
- UREPACKAGEVERSION 3.5.2
+ UREPACKAGEVERSION 3.5.3
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.2
+ ABOUTBOXPRODUCTVERSION 3.5.3
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.2
+ PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.2
+ ABOUTBOXPRODUCTVERSION 3.5.3
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.2
+ PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.2
+ ABOUTBOXPRODUCTVERSION 3.5.3
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.2
+ PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.2
+PACKAGEVERSION 3.5.3
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source
sc/source/ui/docshell/docsh.cxx | 66 ++--
1 file changed, 64 insertions(+), 2 deletions(-)
New commits:
commit 5608a20ce5d526634641112fed77a9a805e9e27c
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 20 14:26:37 2012 +
dummy interception of ScFunc methods with INTERCEPT env var set.
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index ab5dcd9..0bf22e3 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2507,6 +2507,68 @@ sal_Bool ScDocShell::HasAutomaticTableName( const
String rFilter )
|| rFilter.EqualsAscii( pFilterRtf );
}
+namespace {
+
+class ScDocFuncIntercept : public ScDocFunc
+{
+public:
+ScDocFuncIntercept( ScDocShell rDocSh ) : ScDocFunc( rDocSh )
+{
+fprintf( stderr, Interceptor created !\n );
+}
+virtual ~ScDocFuncIntercept() {}
+virtual ScBaseCell* InterpretEnglishString( const ScAddress rPos, const
String rText,
+const String rFormulaNmsp,
+const
formula::FormulaGrammar::Grammar eGrammar,
+short* pRetFormatType )
+{
+fprintf( stderr, interp. english string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::InterpretEnglishString( rPos, rText, rFormulaNmsp,
+ eGrammar, pRetFormatType );
+}
+virtual sal_Bool SetNormalString( const ScAddress rPos, const String
rText, sal_Bool bApi )
+{
+fprintf( stderr, set normal string '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetNormalString( rPos, rText, bApi );
+}
+
+virtual sal_Bool PutCell( const ScAddress rPos, ScBaseCell* pNewCell,
sal_Bool bApi )
+{
+fprintf( stderr, put cell string '%p' %d\n, pNewCell, bApi );
+// rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::PutCell( rPos, pNewCell, bApi );
+}
+
+virtual sal_Bool SetCellText( const ScAddress rPos, const String rText,
+ sal_Bool bInterpret, sal_Bool bEnglish,
sal_Bool bApi,
+ const String rFormulaNmsp,
+ const formula::FormulaGrammar::Grammar
eGrammar )
+{
+fprintf( stderr, set cell text '%s'\n,
+ rtl::OUStringToOString( rText, RTL_TEXTENCODING_UTF8
).getStr() );
+return ScDocFunc::SetCellText( rPos, rText, bInterpret, bEnglish,
bApi, rFormulaNmsp, eGrammar );
+}
+
+virtual bool ShowNote( const ScAddress rPos, bool bShow = true )
+{
+fprintf( stderr, %s note\n, bShow ? show : hide );
+return ScDocFunc::ShowNote( rPos, bShow );
+}
+};
+
+static ScDocFunc *
+createDocFunc( ScDocShell *pThis )
+{
+if (getenv (INTERCEPT))
+return new ScDocFuncIntercept( *pThis );
+else
+return new ScDocFuncDirect( *pThis );
+}
+
+} // anonymous namespace
+
ScDocShell::ScDocShell( const ScDocShell rShell ) :
SvRefBase(),
SotObject(),
@@ -2538,7 +2600,7 @@ ScDocShell::ScDocShell( const ScDocShell rShell ) :
bIsInplace = rShell.bIsInplace;
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
@@ -2585,7 +2647,7 @@ ScDocShell::ScDocShell( const sal_uInt64
i_nSfxCreationFlags ) :
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
-pDocFunc = new ScDocFuncDirect(*this);
+pDocFunc = createDocFunc( this );
// SetBaseModel needs exception handling
ScModelObj::CreateAndSet( this );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - idl/inc idl/source sdext/source unusedcode.easy
idl/inc/module.hxx |2 +-
idl/inc/object.hxx |2 +-
idl/inc/slot.hxx |2 +-
idl/inc/types.hxx |9 ++---
idl/source/objects/module.cxx |4 ++--
idl/source/objects/object.cxx |4 ++--
idl/source/objects/slot.cxx| 10 +-
idl/source/objects/types.cxx |2 +-
idl/source/prj/database.cxx|6 +++---
sdext/source/presenter/PresenterController.cxx |5 -
sdext/source/presenter/PresenterController.hxx |1 -
sdext/source/presenter/PresenterGeometryHelper.cxx | 19 ---
sdext/source/presenter/PresenterGeometryHelper.hxx |4
sdext/source/presenter/PresenterSprite.cxx | 17 -
sdext/source/presenter/PresenterSprite.hxx |6 --
sdext/source/presenter/PresenterSpritePane.cxx |4
sdext/source/presenter/PresenterSpritePane.hxx |2 --
unusedcode.easy|7 ---
18 files changed, 22 insertions(+), 84 deletions(-)
New commits:
commit e516f134fac55a14b155fea70064e1c0553ea50c
Author: Noel Grandin noelgran...@gmail.com
Date: Sun Mar 11 12:03:11 2012 +0200
Convert tools/table.hxx usage to std::map in IDL module
Along the way, convert the table parameter passing to using references
since we are never passing
a null pointer.
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 4e5953e..3a31605 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -96,7 +96,7 @@ public:
WriteType, WriteAttribute = 0 );
virtual voidWriteSfx( SvIdlDataBase rBase, SvStream rOutStm );
virtual voidWriteHelpIds( SvIdlDataBase rBase, SvStream
rOutStm,
-Table* pTable );
+HelpIdTable rTable );
};
SV_DECL_IMPL_REF(SvMetaModule)
SV_DECL_IMPL_PERSIST_LIST(SvMetaModule,SvMetaModule *)
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 1dd2cef..f23262d 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -140,7 +140,7 @@ public:
WriteType, WriteAttribute = 0 );
virtual voidWriteSfx( SvIdlDataBase rBase, SvStream rOutStm );
virtual voidWriteHelpIds( SvIdlDataBase rBase, SvStream
rOutStm,
-Table* pTable );
+HelpIdTable rTable );
};
SV_IMPL_REF(SvMetaClass)
SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *)
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 3c00ca8..d4ae0be 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -260,7 +260,7 @@ public:
sal_uInt16 WriteSlotParamArray( SvIdlDataBase rBase,
SvStream rOutStm );
virtual voidWriteHelpId( SvIdlDataBase rBase, SvStream rOutStm,
- Table * pIdTable );
+ HelpIdTable rIdTable );
virtual voidWriteCSV( SvIdlDataBase, SvStream );
};
SV_DECL_IMPL_REF(SvMetaSlot)
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 508f5a0..b29a83c 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -31,12 +31,15 @@
#include rtl/strbuf.hxx
#include tools/ref.hxx
-#include tools/table.hxx
#include basobj.hxx
+#include map
struct SvSlotElement;
typedef std::vector SvSlotElement* SvSlotElementList;
+class SvMetaSlot;
+typedef std::mapsal_uLong, SvMetaSlot* HelpIdTable;
+
SV_DECL_REF(SvMetaType)
SV_DECL_REF(SvMetaAttribute)
SV_DECL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *)
@@ -119,9 +122,9 @@ public:
virtual voidInsert( SvSlotElementList, const rtl::OString
rPrefix,
SvIdlDataBase );
virtual voidWriteHelpId( SvIdlDataBase rBase, SvStream rOutStm,
- Table * pIdTable );
+ HelpIdTable rIdTable );
virtual voidWriteCSV( SvIdlDataBase, SvStream );
-voidFillIDTable(Table *pIDTable);
+voidFillIDTable(HelpIdTable rIDTable);
rtl::OStringCompare( SvMetaAttribute *pAttr );
};
SV_IMPL_REF(SvMetaAttribute)
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index c261d4c..02a7cc7 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -385,12 +385,12 @@ void SvMetaModule::WriteSfx( SvIdlDataBase rBase,
SvStream rOutStm )
}
void SvMetaModule::WriteHelpIds( SvIdlDataBase rBase, SvStream rOutStm,
-Table* pTable )
+HelpIdTable rTable )
{
for( sal_uLong n = 0; n aClassList.Count(); n++ )
{
[Libreoffice-commits] Changes to 'features/base-preview'
New branch 'features/base-preview' available with the following commits: commit ba8080be6907604e1cd53e22442668d545e36eea Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Mar 20 11:03:08 2012 +0100 fdo#47560 properly separate each new sorting column commit 8b4f2201d43bc7acb2d0ce457a3662596794839e Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Mar 20 11:01:12 2012 +0100 fdo#47370 properly duplicate (invisible) out-of-order sort columns Keep track of position of previous sorting column and use it to decide whether to duplicate invisible new sort column commit eb634d25eab7fad1c9d5ddb7b2633535dc469544 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Mar 15 10:59:28 2012 +0100 self-implemented iterators (no boost) for OUString commit 73f18ab94e7459d5dffdffcce33573bb008bff51 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 28 20:15:06 2012 +0100 off-by-one error in months commit 41d0b76697330fa0b1adbf77f9e73ee3f0cc93e0 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 28 19:27:23 2012 +0100 date parsing: recognise partial dates commit e52cc28fc25879ea02c2cfea39affa3025c03a56 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 28 18:37:38 2012 +0100 add forgotten file lo_traits.hxx commit 6d580cbb4c5debc050727deac4670e440055ef00 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 28 18:31:39 2012 +0100 spirit parser for numbers: add basic dates, create proper grammar commit e89cf657d2c838c9fe42a393ad49506847eede7d Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 28 11:50:43 2012 +0100 Use boost::u16_to_u32_iterator for OUString::const_iterator commit b6ec4ed84e6b97c1792af7ac2e35b3b3508e58ca Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 28 10:49:57 2012 +0100 spirit parser for numbers: first proof-of-concept commit aeb6569cf84798f803e55bf7158e660cce8ffb88 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 27 13:47:24 2012 +0100 fdo#46675: fixup commit e21afa06933d5b8ae23335ff12a4be28bf73e397 Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 27 13:10:40 2012 +0100 fdo#46675: expand group memberships in get*Privileges commit 7033f76646b2357da8b3bd6d6ec664847bd4b479 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 16 09:29:54 2012 +0100 correct indentation commit 4fb2f2870db8becb74eebe62477e3720664950e8 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 16 09:11:08 2012 +0100 typo copy/paste error in error message commit 1101bc5259e79f7e680bc843ce30e0b50194579f Author: Kate Goss katherine.g...@gmail.com Date: Mon Feb 13 21:53:08 2012 + Remove unused code from connectivity::odbc::OPreparedStatement Remove methods getDataBuf(int), getParamLength(int), getPrecision(int). commit 47a4efce56b0aad18f5924c97c0b8c235e9de48e Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 19:41:08 2012 +0100 ODBC: align *all* the handling of SQLULEN properties with maximal ODBC size commit b7782c4a99a87ca262f0f316abd9d7cb68847fb6 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 19:39:01 2012 +0100 comphelper: add getINT64 commit 81038fe1f9e167182d5008b96996ab956ea4a628 Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 18:34:52 2012 +0100 improve OTools::binParameter/bindData interaction Don't duplicate the decision point for data at execution or copied data commit 58a1ed92534e37b4532690cf59fe4708bd031d5c Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 09:49:19 2012 +0100 new[] already allocates each element of the array And calls the default constructor, naturally. commit 70a2f9a3feb761fca259b3bf01df79d4820e651b Author: Lionel Elie Mamane lio...@mamane.lu Date: Tue Feb 14 06:27:51 2012 +0100 odbc getTableTypes: ask the driver instead of guessing commit ca1df36db2179b24e6f3726024d2915316610d9e Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 13 17:53:19 2012 +0100 ResMgr::TestStack more robust commit 6a7770b2feecdf64fc5798200c68597692b986f8 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 9 13:06:27 2012 +0100 reorganise code for better readability No behaviour change intended. However, if behaviour changed, probably the *old* behaviour is buggy, not new one. commit 1e1e7cc4137179c8b50a533fb2317c00f78919f0 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 9 13:04:34 2012 +0100 typo in comment commit e7270e8d6981345712485503db5cec684230c9d6 Author: Lionel Elie Mamane lio...@mamane.lu Date: Thu Feb 9 13:03:24 2012 +0100 ORowSetCache::moveWindow: yet another off-by-one error commit 4fd6e1f82cd51e30a02303d359cd2d60ab1ca6d3 Author: Lionel Elie Mamane lio...@mamane.lu Date: Wed Feb 8 19:08:20 2012 +0100 ORowSetCache::moveWindow fix variable inversion; fixes subsequentcheck commit 1c23c9012334a8314a0cc091a805f6d30e14c066 Author: Lionel Elie
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.1'
Tag 'libreoffice-3.5.2.1' created by Petr Mladek pmla...@suse.cz at 2012-03-20 17:02 -0700 Tag 3.5.2.1 (3.5.2-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPaKopAAoJEPQ0oe+v7q6jPxUQAK2yNw6rAkQZ+d8Q+GbVtM/B q5Q13K+Ph5Z2j9lkBbLMMhquU5IWHqD0/eMatvOWU7qFKXKpg9LbPbyor4CVVG5h J9HppKsti+N0t4SW/lqMxsfY5wa9kMU0iAmMcXDXrnh5HVl4op68txiI1ZnhaNq+ jF632q957VQ1bUxNpVHIoPC5wVB5oLzN0kkbbZUDu7qoPITebeBoXLPQc624kVb4 QwNBujjhBx5V1IBTuRm2WnjllSUWFQhFLqfofl4Zs5mMm+rFuTa8/sc1UVn7n34x ntkxY0CFWiVzuRDE0HnQrSUFh0VToDDQP3NFBWJz6Aj1lDqQ8XUyHMcejz3JuOPu WEnXYZ53ZHXY7CzkxiUos24QMPCALfAU6fBsWJSGKwayF0s+OVQVSf6MRyV3gglI MP/4dJSFjxL5p2q0HLXcp0YrrSK1/yck0i+8RRRV7ccLzFi3gZ8zvGCH9RkBUzCC AhNCyW15AQhyP+m6xGPmTabG1u7WRaO9VItRrWxf0dmqet1TBNWOyq2UZusEEe9i 8c21MIZk5D33eVl48sc73eL9WdOTTyQxMNWL4WfiogWXlA7L1BB4EIYL3kFWwO37 KptmFjah+6dZCMnv3EqCY3VGfquxLJ6sfW0m2s7hEEaP6goSkfqELOlTrHWNe3Ve uHfD4XdGQBwU3TJICzrK =4ylb -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-963: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.2.1'
Tag 'libreoffice-3.5.2.1' created by Petr Mladek pmla...@suse.cz at 2012-03-20 17:02 -0700 Tag 3.5.2.1 (3.5.2-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPaKoqAAoJEPQ0oe+v7q6jlaIP/R7SEa4UKvhkaD5ymwUxDYGb eTSYXU/vRSkjG9L4fAibVqyS7J6I8M0qoMAd1uuswyESZZlxVgCEon6pRuKrizda WcD4OxH4fERyYfa+4lPRJ0Adp4R4EruI75HzE15rjgbJLa3T/fzfiB6SMz7WuLqR 6bRnbgoiklMMips/UFHSGcQ2n1GgJX6WbcoW4OGZWEgBWUNEN6cBQvjsS9eENUtb e+7iTctStXE2VUOxQ9Rtb3DN9vf06dP8spPG7CFvHWbwqey8YynVASwcZ7WvHrmy hYPBeQvgdfc+BDe2mOaUQv2w9Nvnd722Megg/MnACP2IY5bRY9gApwL8LDX2Z7D6 wmubUEX+Aje+odcQLHdW+PokX69nS0XOpp8rbCbwfytDSAMtaMqxqZhoJ39qwMbB zVMDEPqWTwxZk4jExwQSqLuOcf7t7Go9e5sq7d/cFMSmHiWjH8KPA/cftMKQ6f3q BaFyIzUYqS+sQYxTVY9vDi7FOCsVZRNS++exD6u02I0xzGMHoUizqkkDapNOx06J VH43non/hcDVXteDOufuh+sT/Oy6vOhh/VoJgxrrs9N0H+aAxd3h9l4Dny2U9E0l 84L0zeFfKZJn+VAFa79yK7byxVi34AiP9RP7DbtkS1/CpYZs09xDyEvNRK+ZUMgr Iwa6pi4GKem4aJyhUj3E =7sTS -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-30: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/inc basegfx/source sw/source
basegfx/inc/basegfx/tools/zoomtools.hxx |2 --
basegfx/source/tools/zoomtools.cxx | 21 -
sw/source/ui/uiview/viewport.cxx|6 +++---
3 files changed, 3 insertions(+), 26 deletions(-)
New commits:
commit f626ff59b229ce7aec2f2313936133c53d70781f
Author: Tim Hardeck thard...@suse.com
Date: Thu Feb 23 19:59:34 2012 +0100
removed zoomtools int functions
Changed viewport.cxx to use long instead of int like all other zoom
functions and in this succession removed the zoomtools int functions
which where only added for this one exception.
diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx
b/basegfx/inc/basegfx/tools/zoomtools.hxx
index 566418d..44d9052 100644
--- a/basegfx/inc/basegfx/tools/zoomtools.hxx
+++ b/basegfx/inc/basegfx/tools/zoomtools.hxx
@@ -42,8 +42,6 @@ namespace basegfx
{
BASEGFX_DLLPUBLIC long zoomOut(long nCurrent);
BASEGFX_DLLPUBLIC long zoomIn(long nCurrent);
-BASEGFX_DLLPUBLIC int zoomOut(int nCurrent);
-BASEGFX_DLLPUBLIC int zoomIn(int nCurrent);
}
}
diff --git a/basegfx/source/tools/zoomtools.cxx
b/basegfx/source/tools/zoomtools.cxx
index d4b274c..34b0b8c 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -129,27 +129,6 @@ long zoomOut(long nCurrent)
nNew = enforceStep(nNew, nCurrent, 25);
return nNew;
}
-
-/**
-* Increasing the zoom level.
-*
-* @param nCurrent current zoom factor
-*/
-int zoomIn(int nCurrent)
-{
-return static_castint( zoomIn( long( nCurrent ) ) );
-}
-
-/**
-* Decreasing the zoom level.
-*
-* @param nCurrent current zoom factor
-*/
-int zoomOut(int nCurrent)
-{
-return static_castint( zoomOut( long( nCurrent ) ) );
-}
-
} // namespace zoomtools
} // namespace basegfx
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index d6b723d..e28d63e 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1307,11 +1307,11 @@ sal_Bool SwView::HandleWheelCommands( const
CommandEvent rCEvt )
const CommandWheelData* pWData = rCEvt.GetWheelData();
if( pWData COMMAND_WHEEL_ZOOM == pWData-GetMode() )
{
-sal_uInt16 nFact = pWrtShell-GetViewOptions()-GetZoom();
+long nFact = pWrtShell-GetViewOptions()-GetZoom();
if( 0L pWData-GetDelta() )
-nFact = static_cast sal_uInt16 (Max( 20,
basegfx::zoomtools::zoomOut( static_castint(nFact) )));
+nFact = Max( (long) 20, basegfx::zoomtools::zoomOut( nFact ));
else
-nFact = static_cast sal_uInt16 (Min( 600,
basegfx::zoomtools::zoomIn( static_castint(nFact) )));
+nFact = Min( (long) 600, basegfx::zoomtools::zoomIn( nFact ));
SetZoom( SVX_ZOOM_PERCENT, nFact );
bOk = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-2' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 61f951c1fac78cfdf7da7b1e05d02ff7a584fc25 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 20 18:02:14 2012 +0100 bump product version to 3.5.2-rc1+, release number to 201 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 2d32336..4636aad 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.2 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.2 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.2 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX
[Libreoffice-commits] .: oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk vbahelper/source
oovbaapi/UnoApi_oovbaapi.mk |1
oovbaapi/ooo/vba/SystemColorConstants.idl| 31 +++
oovbaapi/ooo/vba/msforms/XCheckBox.idl |3 +
oovbaapi/ooo/vba/msforms/XComboBox.idl |3 +
oovbaapi/ooo/vba/msforms/XCommandButton.idl |3 +
oovbaapi/ooo/vba/msforms/XImage.idl |1
oovbaapi/ooo/vba/msforms/XLabel.idl |2 +
oovbaapi/ooo/vba/msforms/XTextBox.idl|3 +
vbahelper/source/msforms/vbabutton.cxx | 21 ++---
vbahelper/source/msforms/vbabutton.hxx |2 +
vbahelper/source/msforms/vbacheckbox.cxx | 29 ++
vbahelper/source/msforms/vbacheckbox.hxx |6 +++
vbahelper/source/msforms/vbacombobox.cxx | 29 ++
vbahelper/source/msforms/vbacombobox.hxx |6 +++
vbahelper/source/msforms/vbacontrol.cxx | 42 +++
vbahelper/source/msforms/vbacontrol.hxx |8 +
vbahelper/source/msforms/vbaimage.cxx| 10 ++
vbahelper/source/msforms/vbaimage.hxx|2 +
vbahelper/source/msforms/vbalabel.cxx| 20
vbahelper/source/msforms/vbalabel.hxx|4 ++
vbahelper/source/msforms/vbatextbox.cxx | 30 +++
vbahelper/source/msforms/vbatextbox.hxx |7
vbahelper/source/msforms/vbatogglebutton.cxx | 20 ++--
vbahelper/source/msforms/vbatogglebutton.hxx |2 +
24 files changed, 275 insertions(+), 10 deletions(-)
New commits:
commit 092d6d9d6f9e6d79dd99d5f502ff39398622c2e1
Author: Noel Power noel.po...@novell.com
Date: Tue Mar 20 15:35:30 2012 +
add vba support for BackColor, AutoSize, Locked attributes bnc#749960
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 57a0c11..00eeb88 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -75,6 +75,7 @@ $(eval $(call
gb_UnoApiTarget_add_idlfiles,oovbaapi,oovbaapi/ooo/vba,\
VbMsgBoxStyle \
VbQueryClose \
VbStrConv \
+SystemColorConstants \
VbTriState \
VbVarType \
XApplicationBase \
diff --git a/oovbaapi/ooo/vba/SystemColorConstants.idl
b/oovbaapi/ooo/vba/SystemColorConstants.idl
new file mode 100644
index 000..e0760f1
--- /dev/null
+++ b/oovbaapi/ooo/vba/SystemColorConstants.idl
@@ -0,0 +1,31 @@
+module ooo { module vba {
+constants SystemColorConstants {
+
+const long vbScrollBars = -2147483648;// 0x8000;
+const long vbDesktop = -2147483647; //0x8001;
+const long vbActiveTitleBar = -2147483646; //0x8002;
+const long vbInactiveTitleBar = -2147483645; //0x8003;
+const long vbMenuBar = -2147483644; //0x8004;
+const long vbWindowBackground = -2147483643; //0x8005;
+const long vbWindowFrame = -2147483642; //0x8006;
+const long vbMenuText = -2147483641; //0x8007;
+const long vbWindowText = -2147483640; //0x8008;
+const long vbTitleBarText = -2147483639; //0x8009;
+const long vbActiveBorder = -2147483638; //0x800A;
+const long vbInactiveBorder = -2147483637; //0x800B;
+const long vbApplicationWorkspace = -2147483636; //0x800C;
+const long vbHighlight = -2147483635; //0x800D;
+const long vbHighlightText = -2147483634; //0x800E;
+const long vbButtonFace = -2147483633; //0x800F;
+const long vbButtonShadow = -2147483632; //0x8010;
+const long vbGrayText = -2147483631; //0x8011;
+const long vbButtonText = -2147483630; //0x8012;
+const long vbInactiveCaptionText = -2147483629; //0x8013;
+const long vb3DHighlight = -2147483628; //0x8014;
+const long vb3DDKShadow = -2147483627; //0x8015;
+const long vb3DLight = -2147483626; //0x8016;
+const long vbInfoText = -2147483625; //0x8017;
+const long vbInfoBackground = -2147483624; //0x8018;
+
+};
+}; };
diff --git a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
index ec2c713..fc58d3e 100644
--- a/oovbaapi/ooo/vba/msforms/XCheckBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XCheckBox.idl
@@ -39,6 +39,9 @@ interface XCheckBox: com::sun::star::uno::XInterface
{
[attribute] string Caption;
[attribute] any Value;
+[attribute] long BackColor;
+[attribute] boolean AutoSize;
+[attribute] boolean Locked;
[attribute, readonly] XNewFont Font;
};
diff --git a/oovbaapi/ooo/vba/msforms/XComboBox.idl
b/oovbaapi/ooo/vba/msforms/XComboBox.idl
index 77b5e95..7eacf25 100644
--- a/oovbaapi/ooo/vba/msforms/XComboBox.idl
+++ b/oovbaapi/ooo/vba/msforms/XComboBox.idl
@@ -49,6 +49,9 @@ interface XComboBox
[attribute] long EnterFieldBehavior;
[attribute] long ListStyle;
[attribute] long TextAlign;
+[attribute] long BackColor;
+[attribute] boolean AutoSize;
+[attribute] boolean Locked;
[attribute, readonly] long TextLength;
[attribute, readonly] XNewFont Font;
diff --git
[Libreoffice-commits] .: jurt/com
jurt/com/sun/star/comp/loader/JavaLoader.java | 34 +++---
1 file changed, 15 insertions(+), 19 deletions(-)
New commits:
commit 92a1757fa523bd15412ca1195807ac41205e9438
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 20 18:35:24 2012 +0100
Improve error reporting
diff --git a/jurt/com/sun/star/comp/loader/JavaLoader.java
b/jurt/com/sun/star/comp/loader/JavaLoader.java
index 25fc90b..113e763 100644
--- a/jurt/com/sun/star/comp/loader/JavaLoader.java
+++ b/jurt/com/sun/star/comp/loader/JavaLoader.java
@@ -277,39 +277,35 @@ public class JavaLoader implements XImplementationLoader,
//Normally a string must no be null.
try {
if ( locationUrl != null ) {
-// 1.
clazz = RegistrationClassFinder.find( locationUrl );
-}
-else {
-// 2.
+if (clazz == null) {
+throw new CannotActivateFactoryException(
+Cannot activate jar + locationUrl);
+}
+} else {
clazz = Class.forName( implementationName );
+if (clazz == null) {
+throw new CannotActivateFactoryException(
+Cannot find class + implementationName);
+}
}
}
catch (java.net.MalformedURLException e) {
CannotActivateFactoryException cae = new
CannotActivateFactoryException(
-Can not activate factory because + e.toString() );
-cae.fillInStackTrace();
+Can not activate factory because + e );
+cae.initCause(e);
throw cae;
}
catch (java.io.IOException e) {
CannotActivateFactoryException cae = new
CannotActivateFactoryException(
-Can not activate factory because + e.toString() );
-cae.fillInStackTrace();
+Can not activate factory because + e );
+cae.initCause(e);
throw cae;
}
catch (java.lang.ClassNotFoundException e) {
CannotActivateFactoryException cae = new
CannotActivateFactoryException(
-Can not activate factory because + e.toString() );
-cae.fillInStackTrace();
-throw cae;
-}
-
-if (null == clazz)
-{
-CannotActivateFactoryException cae =
-new CannotActivateFactoryException(
-Cannot determine activation class! );
-cae.fillInStackTrace();
+Can not activate factory because + e );
+cae.initCause(e);
throw cae;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/tubes' - sc/source
sc/source/ui/docshell/docfunc.cxx | 376 +-
sc/source/ui/docshell/docsh.cxx | 17 +
sc/source/ui/inc/docfunc.hxx |5
sc/source/ui/view/viewfunc.cxx| 374 +
4 files changed, 405 insertions(+), 367 deletions(-)
New commits:
commit 2aeebf9060935101e2613da982ed7aed07ea83ed
Author: Michael Meeks michael.me...@suse.com
Date: Tue Mar 20 19:02:01 2012 +
Horribly mangle the ScDocFunc to create a monster
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 973968d..227d6f4 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -100,6 +100,8 @@
#include clipparam.hxx
#include externalrefmgr.hxx
#include undorangename.hxx
+#include funcdesc.hxx
+#include docuno.hxx
#include memory
#include basic/basmgr.hxx
@@ -3770,6 +3772,378 @@ bool ScDocFunc::AutoFormat( const ScRange rRange,
const ScMarkData* pTabMark,
//
+#ifndef LRU_MAX
+#define LRU_MAX 10
+#endif
+
+/*
+ * FIXME: this function detection / auto-entry code should be
+ * pushed up back into the view before this goes to master !
+ */
+
+sal_Bool lcl_FunctionKnown( sal_uInt16 nOpCode )
+{
+const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList();
+if ( pFuncList )
+{
+sal_uLong nCount = pFuncList-GetCount();
+for (sal_uLong i=0; inCount; i++)
+if ( pFuncList-GetFunction(i)-nFIndex == nOpCode )
+return sal_True;
+}
+return false;
+}
+
+sal_Bool lcl_AddFunction( ScAppOptions rAppOpt, sal_uInt16 nOpCode )
+{
+sal_uInt16 nOldCount = rAppOpt.GetLRUFuncListCount();
+sal_uInt16* pOldList = rAppOpt.GetLRUFuncList();
+sal_uInt16 nPos;
+for (nPos=0; nPosnOldCount; nPos++)
+if (pOldList[nPos] == nOpCode) // is the function already in
the list?
+{
+if ( nPos == 0 )
+return false; // already at the top - no
change
+
+// count doesn't change, so the original array is modified
+
+for (sal_uInt16 nCopy=nPos; nCopy0; nCopy--)
+pOldList[nCopy] = pOldList[nCopy-1];
+pOldList[0] = nOpCode;
+
+return sal_True;// list has changed
+}
+
+if ( !lcl_FunctionKnown( nOpCode ) )
+return false; // not in function list - no
change
+
+sal_uInt16 nNewCount = Min( (sal_uInt16)(nOldCount + 1),
(sal_uInt16)LRU_MAX );
+sal_uInt16 nNewList[LRU_MAX];
+nNewList[0] = nOpCode;
+for (nPos=1; nPosnNewCount; nPos++)
+nNewList[nPos] = pOldList[nPos-1];
+rAppOpt.SetLRUFuncList( nNewList, nNewCount );
+
+return sal_True;// list has changed
+}
+
+/**
+ * Enter user data across marked tabs at given row / column
+ *
+ * FIXME: this -badly- needs decomposing into some sane series
+ *of smaller operations.
+ */
+void ScDocFunc::EnterUserDataTabs( SCCOL nCol, SCROW nRow, SCTAB nTab,
+ const ScMarkData rMark,
+ const String rString,
+ sal_Bool bRecord, const EditTextObject*
pData )
+{
+ScDocShellModificator aModificator( rDocShell );
+
+SCTAB nSelCount = rMark.GetSelectCount();
+SCTAB i;
+sal_Bool bEditDeleted = false;
+sal_uInt8 nOldScript = 0;
+ScDocument* pDoc = rDocShell.GetDocument();
+
+ScBaseCell** ppOldCells = NULL;
+sal_Bool* pHasFormat= NULL;
+sal_uLong* pOldFormats = NULL;
+SCTAB* pTabs= NULL;
+SCTAB nUndoPos = 0;
+EditTextObject* pUndoData = NULL;
+if ( bRecord )
+{
+ppOldCells = new ScBaseCell*[nSelCount];
+pHasFormat = new sal_Bool[nSelCount];
+pOldFormats = new sal_uLong[nSelCount];
+pTabs = new SCTAB[nSelCount];
+nUndoPos = 0;
+
+ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end();
+for (; itr != itrEnd; ++itr)
+{
+i = *itr;
+pTabs[nUndoPos] = i;
+ScBaseCell* pDocCell;
+pDoc-GetCell( nCol, nRow, i, pDocCell );
+if ( pDocCell )
+{
+ppOldCells[nUndoPos] = pDocCell-Clone( *pDoc );
+if ( pDocCell-GetCellType() == CELLTYPE_EDIT )
+bEditDeleted = sal_True;
+
+sal_uInt8 nDocScript = pDoc-GetScriptType( nCol, nRow, i,
pDocCell );
+if ( nOldScript == 0 )
+nOldScript = nDocScript;
+else if ( nDocScript != nOldScript )
+bEditDeleted = sal_True;
+}
+else
+ppOldCells[nUndoPos] = NULL;
+
+const SfxPoolItem* pItem;
+const ScPatternAttr*
[Libreoffice-commits] .: vbahelper/source
vbahelper/source/msforms/vbacheckbox.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e1d52ccec31f8ea1b7d875755719255ca06b3cc3 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Mar 20 21:16:52 2012 +0100 Missing SAL_CALL diff --git a/vbahelper/source/msforms/vbacheckbox.hxx b/vbahelper/source/msforms/vbacheckbox.hxx index acddeb3..cc6cbee 100644 --- a/vbahelper/source/msforms/vbacheckbox.hxx +++ b/vbahelper/source/msforms/vbacheckbox.hxx @@ -45,7 +45,7 @@ public: virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException); virtual void SAL_CALL setValue( const css::uno::Any _value ) throw (css::uno::RuntimeException); virtual css::uno::Reference ov::msforms::XNewFont SAL_CALL getFont() throw (css::uno::RuntimeException); -virtual sal_Int32 getBackColor() throw (css::uno::RuntimeException); +virtual sal_Int32 SAL_CALL getBackColor() throw (css::uno::RuntimeException); virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException); virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw (css::uno::RuntimeException); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vbahelper/source
vbahelper/source/msforms/vbacombobox.hxx |2 +-
vbahelper/source/msforms/vbaimage.hxx|2 +-
vbahelper/source/msforms/vbalabel.hxx|2 +-
vbahelper/source/msforms/vbatextbox.hxx |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 88a7c524f2c94829dc1bed49dbe2fde9b1e46f3d
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Mar 20 21:26:53 2012 +0100
More missing SAL_CALL
diff --git a/vbahelper/source/msforms/vbacombobox.hxx
b/vbahelper/source/msforms/vbacombobox.hxx
index ca5c170..8ab8855 100644
--- a/vbahelper/source/msforms/vbacombobox.hxx
+++ b/vbahelper/source/msforms/vbacombobox.hxx
@@ -73,7 +73,7 @@ public:
virtual void SAL_CALL setTextAlign( sal_Int32 nTextAlign ) throw
(css::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getTextLength() throw
(css::uno::RuntimeException);
virtual css::uno::Reference ov::msforms::XNewFont SAL_CALL getFont()
throw (css::uno::RuntimeException);
-virtual sal_Int32 getBackColor() throw (css::uno::RuntimeException);
+virtual sal_Int32 SAL_CALL getBackColor() throw
(css::uno::RuntimeException);
virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw
(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw
(css::uno::RuntimeException);
diff --git a/vbahelper/source/msforms/vbaimage.hxx
b/vbahelper/source/msforms/vbaimage.hxx
index cd5e1bb..5e81c7b 100644
--- a/vbahelper/source/msforms/vbaimage.hxx
+++ b/vbahelper/source/msforms/vbaimage.hxx
@@ -39,7 +39,7 @@ class ScVbaImage : public ImageImpl_BASE
{
public:
ScVbaImage( const css::uno::Reference ov::XHelperInterface xParent,
const css::uno::Reference css::uno::XComponentContext xContext, const
css::uno::Reference css::uno::XInterface xControl, const
css::uno::Reference css::frame::XModel xModel,
ov::AbstractGeometryAttributes* pGeomHelper );
-virtual sal_Int32 getBackColor() throw (css::uno::RuntimeException);
+virtual sal_Int32 SAL_CALL getBackColor() throw
(css::uno::RuntimeException);
virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw
(css::uno::RuntimeException);
//XHelperInterface
virtual rtl::OUString getServiceImplName();
diff --git a/vbahelper/source/msforms/vbalabel.hxx
b/vbahelper/source/msforms/vbalabel.hxx
index 611ae0e..f656aaf 100644
--- a/vbahelper/source/msforms/vbalabel.hxx
+++ b/vbahelper/source/msforms/vbalabel.hxx
@@ -48,7 +48,7 @@ public:
virtual rtl::OUString SAL_CALL getAccelerator() throw
(css::uno::RuntimeException);
virtual void SAL_CALL setAccelerator( const rtl::OUString _accelerator )
throw (css::uno::RuntimeException);
virtual css::uno::Reference ov::msforms::XNewFont SAL_CALL getFont()
throw (css::uno::RuntimeException);
-virtual sal_Int32 getBackColor() throw (css::uno::RuntimeException);
+virtual sal_Int32 SAL_CALL getBackColor() throw
(css::uno::RuntimeException);
virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw
(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw
(css::uno::RuntimeException);
diff --git a/vbahelper/source/msforms/vbatextbox.hxx
b/vbahelper/source/msforms/vbatextbox.hxx
index 25b3a04..a9e21ad 100644
--- a/vbahelper/source/msforms/vbatextbox.hxx
+++ b/vbahelper/source/msforms/vbatextbox.hxx
@@ -54,7 +54,7 @@ public:
virtual void SAL_CALL setBorderStyle( sal_Int32 nBorderStyle ) throw
(css::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getTextLength() throw
(css::uno::RuntimeException);
virtual css::uno::Reference ov::msforms::XNewFont SAL_CALL getFont()
throw (css::uno::RuntimeException);
-virtual sal_Int32 getBackColor() throw (css::uno::RuntimeException);
+virtual sal_Int32 SAL_CALL getBackColor() throw
(css::uno::RuntimeException);
virtual void SAL_CALL setBackColor( sal_Int32 nBackColor ) throw
(css::uno::RuntimeException);
virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException);
virtual void SAL_CALL setAutoSize( sal_Bool bAutoSize ) throw
(css::uno::RuntimeException);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - bin/get-bugzilla-attachments-by-mimetype connectivity/source oox/source sc/source sdext/source unusedcode.easy vcl/win
bin/get-bugzilla-attachments-by-mimetype |7 ++-
connectivity/source/drivers/evoab2/NStatement.cxx | 16 -
connectivity/source/drivers/evoab2/NStatement.hxx |1
connectivity/source/drivers/file/FDriver.cxx | 24 -
connectivity/source/inc/file/fcode.hxx|2 -
oox/source/export/chartexport.cxx | 14 ---
sc/source/filter/oox/biffhelper.cxx | 39 --
sdext/source/presenter/PresenterSprite.cxx|7 ---
sdext/source/presenter/PresenterSprite.hxx|1
sdext/source/presenter/PresenterWindowManager.cxx | 30
unusedcode.easy |5 ++
vcl/win/source/gdi/winlayout.cxx |2 -
12 files changed, 10 insertions(+), 138 deletions(-)
New commits:
commit 08fd513e715209a1295de2e65cbdb47108908826
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 20 20:35:23 2012 +
callcatcher: update list
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx
b/connectivity/source/drivers/evoab2/NStatement.cxx
index 81beb26..7ed9708 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -163,22 +163,6 @@ void SAL_CALL OCommonStatement::close( )
throw(SQLException, RuntimeException)
}
// -
-void OCommonStatement::clearMyResultSet () throw (SQLException)
-{
-::osl::MutexGuard aGuard( m_aMutex );
-checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
-
-try
-{
-ReferenceXCloseable xCloseable;
-if ( ::comphelper::query_interface( m_xResultSet.get(), xCloseable ) )
-xCloseable-close();
-}
-catch( const DisposedException ) { }
-
-m_xResultSet = Reference XResultSet ();
-}
-
EBookQuery *
OCommonStatement::createTrue()
{ // Not the world's most efficient unconditional true but ...
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx
b/connectivity/source/drivers/evoab2/NStatement.hxx
index 3d6d923..2550003 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -190,7 +190,6 @@ namespace connectivity
virtual ~OCommonStatement();
protected:
-void clearMyResultSet () throw(
::com::sun::star::sdbc::SQLException);
void parseSql( const ::rtl::OUString sql, QueryData
_out_rQueryData );
EBookQuery *whereAnalysis( const OSQLParseNode* parseTree );
void orderByAnalysis( const OSQLParseNode*
_pOrderByClause, SortDescriptor _out_rSort );
diff --git a/connectivity/source/drivers/file/FDriver.cxx
b/connectivity/source/drivers/file/FDriver.cxx
index f3e9549..6f481ec 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -246,31 +246,7 @@ Reference XTablesSupplier SAL_CALL
OFileDriver::getDataDefinitionByURL( const
}
return getDataDefinitionByConnection(connect(url,info));
}
-//
-
-void OOperandParam::describe(const Reference XPropertySet rColumn,
::rtl::Referenceconnectivity::OSQLColumns rParameterColumns)
-{
-// den alten namen beibehalten
-
-OSL_ENSURE(getRowPos() rParameterColumns-get().size(),Invalid index
for orderkey values!);
-
-Reference XPropertySet xColumn = (rParameterColumns-get())[getRowPos()];
-
-try
-{
-
xColumn-setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME),rColumn-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
-
xColumn-setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE),rColumn-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
-
xColumn-setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION),rColumn-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)));
-
xColumn-setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE),rColumn-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)));
-
xColumn-setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE),rColumn-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)));
-
xColumn-setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE),rColumn-getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)));
-
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt |3 +--
instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt |3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
New commits:
commit ea3967103430b96e5cd2c4d201840a0d827d9d76
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 21:41:49 2012 +0100
remove last traces of serial number check from MSI
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
CustomerInformationCancel SpawnDialog CancelSetup 1 0
CustomerInformationNext[ALLUSERS] {} ApplicationUsers =
OnlyCurrentUser And Privileged 2
CustomerInformationNext[ALLUSERS] 1 ApplicationUsers =
AllUsers And Privileged1
-CustomerInformationNextEndDialog Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog SetupType ((Not
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog SetupType 1 3
CustomSetupBackNewDialog MaintenanceType Installed 0
CustomSetupBackNewDialog SetupType NOT Installed 0
CustomSetupCancel SpawnDialog CancelSetup 1 0
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
CustomerInformationCancel SpawnDialog CancelSetup 1 0
CustomerInformationNext[ALLUSERS] {} ApplicationUsers =
OnlyCurrentUser And Privileged 2
CustomerInformationNext[ALLUSERS] 1 ApplicationUsers =
AllUsers And Privileged1
-CustomerInformationNextEndDialog Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog SetupType ((Not
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog SetupType 1 3
CustomSetupBackNewDialog MaintenanceType Installed 0
CustomSetupBackNewDialog SetupType NOT Installed 0
CustomSetupCancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 3eb1b85..b32bd00 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -22,8 +22,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
CustomerInformationCancel SpawnDialog CancelSetup 1 0
CustomerInformationNext[ALLUSERS] {} ApplicationUsers =
OnlyCurrentUser And Privileged 2
CustomerInformationNext[ALLUSERS] 1 ApplicationUsers =
AllUsers And Privileged1
-CustomerInformationNextEndDialog Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog SetupType ((Not
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog SetupType 1 3
CustomSetupBackNewDialog MaintenanceType Installed 0
CustomSetupBackNewDialog SetupType NOT Installed 0
CustomSetupCancel SpawnDialog CancelSetup 1 0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 05254de..e0476e9 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation BackNewDialog InstallWelcome
1 1
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 ---
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |1 -
instsetoo_native/inc_ure/windows/msi_templates/Control.idt |1 -
6 files changed, 8 deletions(-)
New commits:
commit 90ec7ecb86f4cc2005ac1c5a7e70b19fbdc02426
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 21:55:28 2012 +0100
remove last traces of serial number check from MSI
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index e9a7742..1369af6 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,6 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e9a7742..1369af6 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,6 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 249120b..5c54cc9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -76,9 +76,6 @@ en-US = Back
[OOO_CONTROL_35]
en-US = Cancel
-[OOO_CONTROL_36]
-en-US = {\Tahoma8}{80}
-
[OOO_CONTROL_37]
en-US = Organization:
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7599ae5..05a7a79 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,6 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 88 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine
[Libreoffice-commits] .: sc/qa
sc/qa/unit/ucalc.cxx | 50 ++
1 file changed, 50 insertions(+)
New commits:
commit fdcac5fa84b5fba908a0e59b0ceb953da58e8609
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Mar 20 16:27:20 2012 -0400
Added more code to test the integrity of the source data arrays.
Source data array stores item IDs and represents the original data
series before normalization.
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5324601..43ea584 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -147,6 +147,10 @@ public:
*/
void testPivotTableNamedSource();
+/**
+ * Test for pivot table cache. Each dimension in the pivot cache stores
+ * only unique values that are sorted in ascending order.
+ */
void testPivotTableCache();
void testSheetCopy();
@@ -1987,6 +1991,52 @@ void Test::testPivotTableCache()
pItem = aCache.GetItemDataById(2, 6);
CPPUNIT_ASSERT_MESSAGE(wrong item value, !pItem);
+{
+// Check the integrity of the source data.
+ScDPItemData aTest;
+long nDim;
+
+{
+// Dimension 0: Z, R, A, F, Y, 12
+nDim = 0;
+const char* aChecks[] = { Z, R, A, F, Y };
+for (size_t i = 0; i SAL_N_ELEMENTS(aChecks); ++i)
+{
+pItem = aCache.GetItemDataById(nDim,
aCache.GetItemDataId(nDim, i, false));
+aTest.SetString(rtl::OUString::createFromAscii(aChecks[i]));
+CPPUNIT_ASSERT_MESSAGE(wrong data value, pItem *pItem ==
aTest);
+}
+
+pItem = aCache.GetItemDataById(nDim, aCache.GetItemDataId(nDim, 5,
false));
+aTest.SetValue(12);
+CPPUNIT_ASSERT_MESSAGE(wrong data value, pItem *pItem ==
aTest);
+}
+
+{
+// Dimension 1: A, A, B, B, C, C
+nDim = 1;
+const char* aChecks[] = { A, A, B, B, C, C };
+for (size_t i = 0; i SAL_N_ELEMENTS(aChecks); ++i)
+{
+pItem = aCache.GetItemDataById(nDim,
aCache.GetItemDataId(nDim, i, false));
+aTest.SetString(rtl::OUString::createFromAscii(aChecks[i]));
+CPPUNIT_ASSERT_MESSAGE(wrong data value, pItem *pItem ==
aTest);
+}
+}
+
+{
+// Dimension 2: 30, 20, 45, 12, 8, 15
+nDim = 2;
+double aChecks[] = { 30, 20, 45, 12, 8, 15 };
+for (size_t i = 0; i SAL_N_ELEMENTS(aChecks); ++i)
+{
+pItem = aCache.GetItemDataById(nDim,
aCache.GetItemDataId(nDim, i, false));
+aTest.SetValue(aChecks[i]);
+CPPUNIT_ASSERT_MESSAGE(wrong data value, pItem *pItem ==
aTest);
+}
+}
+}
+
m_pDoc-DeleteTab(0);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |1 +
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |1 +
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 +++
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |1 +
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |1 +
instsetoo_native/inc_ure/windows/msi_templates/Control.idt |1 +
6 files changed, 8 insertions(+)
New commits:
commit a82dee49aade4685af6a9b8f153cc5e7673a36ca
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 22:06:42 2012 +0100
fix control order in MSI
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index e9a7742..9cde5eb 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e9a7742..9cde5eb 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7599ae5..acd4bd0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 88 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 SerialLabel
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line90 234 284 0 1
diff --git
[Libreoffice-commits] .: vbahelper/inc
vbahelper/inc/vbahelper/vbaaccesshelper.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 707609c31cc144e3d39dd04d0a85b0d13c4ce4a1
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Tue Mar 20 22:21:03 2012 +0100
correct exception specification on a function
It's obvious that the function above is called by this one, and the
exception
it throws cannot really propagate. The solution to this mystery is the fact
that msvc doesn't give a damn, and gcc does not either since OOo has used
-fno-enforce-sh-specs since 2001. But clang does, so fix this for now,
although it should possibly be just dumped.
diff --git a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
index 2533b5c..761d3a2 100644
--- a/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
+++ b/vbahelper/inc/vbahelper/vbaaccesshelper.hxx
@@ -51,7 +51,7 @@ namespace ooo
return xVBAFactory;
}
-VBAHELPER_DLLPRIVATE inline css::uno::Reference css::uno::XInterface
createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char*
_pAsciiName, const css::uno::Sequence css::uno::Any aArgs ) throw
(css::uno::RuntimeException)
+VBAHELPER_DLLPRIVATE inline css::uno::Reference css::uno::XInterface
createVBAUnoAPIServiceWithArgs( SfxObjectShell* pShell, const sal_Char*
_pAsciiName, const css::uno::Sequence css::uno::Any aArgs ) throw
(css::uno::Exception)
{
OSL_PRECOND( pShell, createVBAUnoAPIService: no shell! );
::rtl::OUString sVarName( ::rtl::OUString::createFromAscii(
_pAsciiName ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt |2 +-
instsetoo_native/inc_ure/windows/msi_templates/Control.idt |2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 8941a9ad0173f10b5d7cf4c7d254d79c886f36b2
Author: Andras Timar ati...@suse.com
Date: Tue Mar 20 22:50:14 2012 +0100
fix control order in MSI, this time for real
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 9cde5eb..f798e24 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 9cde5eb..f798e24 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 140 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 140 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line145 234 229 0 1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index acd4bd0..240b178 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,7 @@ CustomerInformation BannerLine Line0 44
374 0 1
CustomerInformationBranding1 Text4 229 88 13
3 {MSSWhiteSerif8}[ProductName]
CustomerInformationBranding2 Text3 228 88 13
65537 [ProductName]
CustomerInformationCancel PushButton 301 243 66 17
3 OOO_CONTROL_35 NameLabel
-CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 Next
+CustomerInformationCompanyEdit Edit21 100 237 17
3 COMPANYNAME OOO_CONTROL_36 RadioGroup
CustomerInformationCompanyLabelText21 89 75 10
3 OOO_CONTROL_37 CompanyEdit
CustomerInformationDlgDesc Text21 23 272 25 65539
OOO_CONTROL_38
CustomerInformationDlgLine Line90 234 284 0 1
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt
[Libreoffice-commits] .: sc/source
sc/source/filter/excel/xepivot.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit aeed13079e9cfd95a25b9b4faac6c95b0b4c8f23
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Mar 21 00:42:15 2012 -0400
Export to xls correct item values for grouped fields.
diff --git a/sc/source/filter/excel/xepivot.cxx
b/sc/source/filter/excel/xepivot.cxx
index 324f802..df41e8c 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -548,18 +548,22 @@ void XclExpPCField::InsertNumDateGroupItems( const
ScDPObject rDPObj, const ScD
return;
ScSheetDPData aDPData(GetDocPtr(), *pSrcDesc, pCache);
-const std::vector SCROW aOrignial = aDPData.GetColumnEntries(
static_cast long ( GetBaseFieldIndex() ) );
+long nDim = GetFieldIndex();
+const std::vector SCROW aOrignial = aDPData.GetColumnEntries(nDim);
// get the string collection with generated grouping elements
ScDPNumGroupDimension aTmpDim( rNumInfo );
if( nDatePart != 0 )
aTmpDim.MakeDateHelper( rNumInfo, mnFieldIdx, nDatePart );
const std::vectorSCROW aMemberIds = aTmpDim.GetNumEntries(
-static_castSCCOL(GetBaseFieldIndex()),
aDPData.GetCacheTable().getCache());
+static_castSCCOL(nDim), pCache);
for ( size_t nIdx = 0 ; nIdx aMemberIds.size(); nIdx++ )
{
-const ScDPItemData* pData = aDPData.GetMemberById( static_cast
long ( GetBaseFieldIndex() ) , aMemberIds[ nIdx] );
+const ScDPItemData* pData = aDPData.GetMemberById(nDim ,
aMemberIds[nIdx]);
if ( pData )
-InsertGroupItem( new XclExpPCItem( pData-GetString() ) );
+{
+rtl::OUString aStr = pCache-GetFormattedString(nDim, *pData);
+InsertGroupItem(new XclExpPCItem(aStr));
+}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: ucb/source
ucb/source/ucp/gvfs/gvfs_provider.cxx |6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) New commits: commit 186ab8e77bd7c7a42ffcca6fa7f8e1819ad04b7d Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Wed Mar 21 06:30:24 2012 +0100 fix after recent XSERVICEINFO_IMPL_1 change diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index 7552a20..c34cbe7 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -84,10 +84,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( -com.sun.star.comp.GnomeVFSContentProvider )), - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( -com.sun.star.ucb.GnomeVFSContentProvider )) ); +com.sun.star.comp.GnomeVFSContentProvider, +com.sun.star.ucb.GnomeVFSContentProvider ); //= // // Service factory implementation. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
