[Libreoffice-commits] core.git: reportdesign/source sc/source
reportdesign/source/ui/report/DesignView.cxx |1 +
sc/source/core/data/documen2.cxx |1 +
2 files changed, 2 insertions(+)
New commits:
commit 5b4486a898968eb5019376ca6c4bd07a97ec537d
Author: homeboy445
AuthorDate: Thu Jan 7 19:02:57 2021 +0530
Commit: Jan-Marek Glogowski
CommitDate: Sat Jan 16 12:18:31 2021 +0100
tdf#97087 Give unique, comphrehensible names to idles
Change-Id: I6823486a45311f81f0ed789dedff6c02b8fb3893
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109056
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski
diff --git a/reportdesign/source/ui/report/DesignView.cxx
b/reportdesign/source/ui/report/DesignView.cxx
index e4eb5f653659..6accf6c82559 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -88,6 +88,7 @@ ODesignView::ODesignView( vcl::Window* pParent,
,m_aScrollWindow(VclPtr::Create(this))
,m_pPropWin(nullptr)
,m_pCurrentView(nullptr)
+,m_aMarkIdle("reportdesign ODesignView Mark Idle")
,m_eMode( DlgEdMode::Select )
,m_eActObj( OBJ_NONE )
,m_aGridSizeCoarse( 1000, 1000 )// #i93595# 100TH_MM changed to grid
using coarse 1 cm grid
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 2e607a669896..56e4fac4d711 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -119,6 +119,7 @@ ScDocument::ScDocument( ScDocumentMode eMode,
SfxObjectShell* pDocShell ) :
nUnoObjectId( 0 ),
nRangeOverflowType( 0 ),
aCurTextWidthCalcPos(MaxCol(),0,0),
+aTrackIdle("sc ScDocument Track Idle"),
nFormulaCodeInTree(0),
nXMLImportedFormulaCount( 0 ),
nInterpretLevel(0),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source sc/source sw/source xmloff/source
reportdesign/source/filter/xml/xmlCell.cxx|8 +--
sc/source/filter/xml/XMLTrackedChangesContext.cxx |3 -
sw/source/filter/xml/xmltbli.cxx | 47 ++
xmloff/source/chart/SchXMLTableContext.cxx|5 --
xmloff/source/table/XMLTableImport.cxx| 10 +---
5 files changed, 32 insertions(+), 41 deletions(-)
New commits:
commit 1b69f0c2731ec66e76073ab0f2936b7112bf1e77
Author: Noel
AuthorDate: Mon Dec 14 15:05:37 2020 +0200
Commit: Noel Grandin
CommitDate: Mon Dec 14 17:46:15 2020 +0100
use more direct parsing on FastAttributeList
instead of first allocating an OUString
Change-Id: I796b1b2d47eb3cb9bebb00ae1bbd465010ebf494
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107691
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx
b/reportdesign/source/filter/xml/xmlCell.cxx
index 27155525ba69..adfac9d59cc6 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -62,18 +62,16 @@ OXMLCell::OXMLCell( ORptFilter& rImport
for (auto &aIter : sax_fastparser::castToFastAttributeList( _xAttrList ))
{
-OUString sValue = aIter.toString();
-
switch( aIter.getToken() )
{
case XML_ELEMENT(TABLE, XML_STYLE_NAME):
-m_sStyleName = sValue;
+m_sStyleName = aIter.toString();
break;
case XML_ELEMENT(TABLE, XML_NUMBER_COLUMNS_SPANNED):
-m_pContainer->setColumnSpanned(sValue.toInt32());
+m_pContainer->setColumnSpanned(aIter.toInt32());
break;
case XML_ELEMENT(TABLE, XML_NUMBER_ROWS_SPANNED):
-m_pContainer->setRowSpanned(sValue.toInt32());
+m_pContainer->setRowSpanned(aIter.toInt32());
break;
default:
XMLOFF_WARN_UNKNOWN("reportdesign", aIter);
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index 2accb0987344..d8292c5feecd 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -666,9 +666,8 @@ uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
ScXMLChangeTextPContext
sal_Int32 nRepeat(0);
for( auto& aIter : sax_fastparser::castToFastAttributeList(mxAttrList)
)
{
-const OUString sValue = aIter.toString();
if (aIter.getToken() == XML_ELEMENT(TEXT, XML_C))
-nRepeat = sValue.toInt32();
+nRepeat = aIter.toInt32();
else
XMLOFF_WARN_UNKNOWN("sc", aIter);
}
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 77f7ee7f9128..be694b483d00 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -356,15 +356,14 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
m_sSaveParaDefault =
GetImport().GetTextImport()->GetCellParaStyleDefault();
for( auto& aIter : sax_fastparser::castToFastAttributeList(xAttrList) )
{
-const OUString sValue = aIter.toString();
switch( aIter.getToken() )
{
case XML_ELEMENT(TABLE, XML_STYLE_NAME):
-m_aStyleName = sValue;
-GetImport().GetTextImport()->SetCellParaStyleDefault(sValue);
+m_aStyleName = aIter.toString();
+GetImport().GetTextImport()->SetCellParaStyleDefault(m_aStyleName);
break;
case XML_ELEMENT(TABLE, XML_NUMBER_COLUMNS_SPANNED):
-m_nColSpan = static_cast(std::max(1,
sValue.toInt32()));
+m_nColSpan = static_cast(std::max(1,
aIter.toInt32()));
if (m_nColSpan > 256)
{
SAL_INFO("sw.xml", "ignoring huge table:number-columns-spanned
" << m_nColSpan);
@@ -372,7 +371,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
}
break;
case XML_ELEMENT(TABLE, XML_NUMBER_ROWS_SPANNED):
-m_nRowSpan = static_cast(std::max(1,
sValue.toInt32()));
+m_nRowSpan = static_cast(std::max(1,
aIter.toInt32()));
if (m_nRowSpan > 8192 || (m_nRowSpan > 256 &&
utl::ConfigManager::IsFuzzing()))
{
SAL_INFO("sw.xml", "ignoring huge table:number-rows-spanned "
<< m_nRowSpan);
@@ -380,7 +379,7 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl(
}
break;
case XML_ELEMENT(TABLE, XML_NUMBER_COLUMNS_REPEATED):
-m_nColRepeat = static_cast(std::max(1,
sValue.toInt32()));
+m_nColRepeat = static_cast(std::max(1,
aIter.toInt32()));
if (m_nColRepeat > 256)
{
SAL_INFO("sw.xml", "ignoring huge
table:number-columns-repeated " << m_nColRepeat);
@@ -3
[Libreoffice-commits] core.git: reportdesign/source sc/source sw/source
reportdesign/source/filter/xml/xmlfilter.cxx |5 ++---
sc/source/filter/xml/xmlexternaltabi.cxx | 10 --
sc/source/filter/xml/xmlexternaltabi.hxx |2 --
sw/source/core/swg/SwXMLSectionList.cxx | 16 +++-
4 files changed, 13 insertions(+), 20 deletions(-)
New commits:
commit ead34a4d34db05d5718d96b66f5e39d886c8b699
Author: Noel Grandin
AuthorDate: Wed Nov 13 09:35:05 2019 +0200
Commit: Noel Grandin
CommitDate: Wed Nov 13 10:26:35 2019 +0100
no need to store reference to Import here
can just cast the parent member
Change-Id: I990bd4da3afbd78da819038c7907c28de87faaaf
Reviewed-on: https://gerrit.libreoffice.org/82567
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 00f7fe86a9c5..e4df625cacce 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -86,7 +86,7 @@ using namespace ::com::sun::star::util;
class RptMLMasterStylesContext_Impl:
public XMLTextMasterStylesContext
{
-ORptFilter& m_rImport;
+ORptFilter& GetImport() { return
static_cast(XMLTextMasterStylesContext::GetImport()); }
public:
@@ -106,14 +106,13 @@
RptMLMasterStylesContext_Impl::RptMLMasterStylesContext_Impl(
const OUString& rLName ,
const uno::Reference< xml::sax::XAttributeList > & xAttrList ) :
XMLTextMasterStylesContext( rImport, nPrfx, rLName, xAttrList )
-,m_rImport(rImport)
{
}
void RptMLMasterStylesContext_Impl::EndElement()
{
FinishStyles( true );
-m_rImport.FinishStyles();
+GetImport().FinishStyles();
}
/// read a component (file + filter version)
diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx
b/sc/source/filter/xml/xmlexternaltabi.cxx
index 8d0a810dad09..5515fd835ba5 100644
--- a/sc/source/filter/xml/xmlexternaltabi.cxx
+++ b/sc/source/filter/xml/xmlexternaltabi.cxx
@@ -43,7 +43,6 @@
ScXMLExternalRefTabSourceContext::ScXMLExternalRefTabSourceContext(
ScXMLImport& rImport,
const rtl::Reference& rAttrList,
ScXMLExternalTabData& rRefInfo ) :
ScXMLImportContext( rImport ),
-mrScImport(rImport),
mrExternalRefInfo(rRefInfo)
{
using namespace ::xmloff::token;
@@ -98,7 +97,7 @@ static bool lcl_isValidRelativeURL(const OUString& rUrl)
void SAL_CALL ScXMLExternalRefTabSourceContext::endFastElement( sal_Int32
/*nElement*/ )
{
-ScDocument* pDoc = mrScImport.GetDocument();
+ScDocument* pDoc = GetScImport().GetDocument();
if (!pDoc)
return;
@@ -111,7 +110,6 @@ void SAL_CALL
ScXMLExternalRefTabSourceContext::endFastElement( sal_Int32 /*nEle
ScXMLExternalRefRowsContext::ScXMLExternalRefRowsContext(
ScXMLImport& rImport, ScXMLExternalTabData& rRefInfo ) :
ScXMLImportContext( rImport ),
-mrScImport(rImport),
mrExternalRefInfo(rRefInfo)
{
}
@@ -126,7 +124,7 @@ Reference< XFastContextHandler > SAL_CALL
ScXMLExternalRefRowsContext::createFas
// #i101319# row elements inside group, rows or header-rows
// are treated like row elements directly in the table element
-const SvXMLTokenMap& rTokenMap = mrScImport.GetTableRowsElemTokenMap();
+const SvXMLTokenMap& rTokenMap = GetScImport().GetTableRowsElemTokenMap();
sal_uInt16 nToken = rTokenMap.Get( nElement );
sax_fastparser::FastAttributeList *pAttribList =
sax_fastparser::FastAttributeList::castToFastAttributeList( xAttrList
);
@@ -137,10 +135,10 @@ Reference< XFastContextHandler > SAL_CALL
ScXMLExternalRefRowsContext::createFas
case XML_TOK_TABLE_ROWS_HEADER_ROWS:
case XML_TOK_TABLE_ROWS_ROWS:
return new ScXMLExternalRefRowsContext(
-mrScImport, mrExternalRefInfo);
+GetScImport(), mrExternalRefInfo);
case XML_TOK_TABLE_ROWS_ROW:
return new ScXMLExternalRefRowContext(
-mrScImport, pAttribList, mrExternalRefInfo);
+GetScImport(), pAttribList, mrExternalRefInfo);
default:
;
}
diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx
b/sc/source/filter/xml/xmlexternaltabi.hxx
index 08e3fb2d2686..5afb5c5f9bfc 100644
--- a/sc/source/filter/xml/xmlexternaltabi.hxx
+++ b/sc/source/filter/xml/xmlexternaltabi.hxx
@@ -40,7 +40,6 @@ public:
virtual void SAL_CALL endFastElement( sal_Int32 nElement ) override;
private:
-ScXMLImport&mrScImport;
ScXMLExternalTabData& mrExternalRefInfo;
OUString maRelativeUrl;
@@ -61,7 +60,6 @@ public:
const css::uno::Reference<
css::xml::sax::XFastAttributeList >& xAttrList ) override;
private:
-ScXMLImport&mrScImport;
ScXMLExternalTabData& mrExternalRefInfo;
};
diff --git a/sw/source/core/swg/SwXMLSectionList.cxx
b/sw/source/core/swg/SwXMLSectionList.cxx
index 1940ebfea478..2f835bd606a3 10064
[Libreoffice-commits] core.git: reportdesign/source sc/source svtools/source sw/source
reportdesign/source/core/sdr/UndoEnv.cxx |2 +-
reportdesign/source/ui/report/ReportControllerObserver.cxx |2 +-
sc/source/filter/inc/tool.h |2 +-
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |2 +-
svtools/source/misc/imap.cxx |2 +-
sw/source/core/frmedt/fecopy.cxx |2 +-
sw/source/core/layout/atrfrm.cxx |2 +-
sw/source/filter/ww8/wrtw8sty.cxx|2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit cbe7bdfd7c0fe474161e2d141d4dd5948e50c3da
Author: Jens Carl
Date: Thu Jun 22 07:14:26 2017 +
tdf#39468 Translate some random German comments/terms
Change-Id: I38cb79abb2a495ccca454903bc46b407009e8290
Reviewed-on: https://gerrit.libreoffice.org/39084
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 2a15451094a1..ed3caaaba4a8 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -360,7 +360,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const
ContainerEvent& evt)
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-// neues Object zum lauschen
+// new listener object
Reference< uno::XInterface > xIface( evt.Element, UNO_QUERY );
if ( !IsLocked() )
{
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx
b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 662beca901e7..f20239c29869 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -348,7 +348,7 @@ void SAL_CALL
OXReportControllerObserver::elementInserted(const container::Conta
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
-// neues Object zum lauschen
+// new listner object
uno::Reference< uno::XInterface > xIface( evt.Element, uno::UNO_QUERY );
if ( xIface.is() )
{
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 08384c732767..c2a5b2bc62b7 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -116,7 +116,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8
nFormat, sal_uInt8 nSt
pRet = aIdents[ nIndex ].GetAttr();
else
{
-// neues Attribut anlegen
+// create new attribute
pAttr = NewAttr( nFormat, nSt );
OSL_ENSURE( pAttr, "FormCache::GetAttr(): Nothing to save" );
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 4a76e4abb9f5..ee5e31ba3911 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -360,7 +360,7 @@ sal_Int32 ScNotesChildren::CheckChanges(const
ScPreviewLocationData& rData,
if (aNote.maNoteText == aItr->maNoteText)
{
aNote.mpTextHelper = aItr->mpTextHelper;
-if (aNote.maRect != aItr->maRect) //neue VisArea
setzen
+if (aNote.maRect != aItr->maRect) // set new VisArea
{
aNote.mpTextHelper->SetOffset(aNote.maRect.TopLeft());
aNote.mpTextHelper->UpdateChildren();
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 68b912d87f65..83d8cc5c205a 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -863,7 +863,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t
nCount )
nCount = nMaxRecords;
}
-// neue Objekte einlesen
+// read new objects
for (size_t i = 0; i < nCount; ++i)
{
sal_uInt16 nType;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 11513cf65eff..743920a0b8f3 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1005,7 +1005,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
}
else
{
-OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(),
"Neues Format.");
+OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(),
"New format.");
// #i52780# - drawing object has
// to be made visible on paste.
pNew->CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::PREPPASTING));
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 1a459f5d14cb
[Libreoffice-commits] core.git: reportdesign/source sc/source sd/source sw/source
reportdesign/source/core/api/ReportDefinition.cxx | 37 --
reportdesign/source/filter/xml/xmlExport.cxx |7 +---
sc/source/core/data/attrib.cxx| 36 ++---
sc/source/core/data/fillinfo.cxx |3 -
sc/source/core/data/table3.cxx|1
sc/source/core/tool/chgtrack.cxx |2 -
sc/source/core/tool/interpr1.cxx |3 -
sc/source/filter/excel/read.cxx |1
sc/source/filter/excel/xetable.cxx|1
sc/source/filter/html/htmlexp.cxx |2 -
sc/source/ui/app/drwtrans.cxx |4 --
sc/source/ui/app/transobj.cxx |2 -
sc/source/ui/docshell/docsh5.cxx |5 --
sc/source/ui/docshell/docsh8.cxx | 12 ---
sc/source/ui/drawfunc/fusel.cxx |6 ---
sc/source/ui/unoobj/styleuno.cxx |3 -
sc/source/ui/view/editsh.cxx |1
sc/source/ui/view/output2.cxx |2 -
sc/source/ui/view/viewfun2.cxx|1
sd/source/core/drawdoc3.cxx |2 -
sd/source/filter/ppt/propread.cxx |2 -
sd/source/ui/unoidl/unosrch.cxx |1
sw/source/core/docnode/ndtbl.cxx |1
sw/source/core/edit/autofmt.cxx |1
sw/source/core/text/frmcrsr.cxx |2 -
sw/source/filter/ww8/ww8par2.cxx |2 -
sw/source/filter/ww8/ww8par5.cxx |6 +--
sw/source/filter/ww8/ww8scan.cxx |1
sw/source/uibase/dochdl/swdtflvr.cxx |4 --
sw/source/uibase/docvw/edtwin.cxx |1
sw/source/uibase/uno/unomod.cxx |3 -
sw/source/uibase/utlui/prcntfld.cxx |5 --
sw/source/uibase/utlui/uitool.cxx |1
sw/source/uibase/wrtsh/select.cxx |2 -
34 files changed, 40 insertions(+), 123 deletions(-)
New commits:
commit 7b26389414b203a4f3225acf0c027b93bcb234ac
Author: Noel Grandin
Date: Fri May 20 12:02:48 2016 +0200
clang-tidy clang-analyzer-deadcode.DeadStores
Change-Id: I7113a13ac36db5beef3a17e9849c1f5506df2374
Reviewed-on: https://gerrit.libreoffice.org/25194
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 4349d28..f4ccbb0 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1317,8 +1317,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
uno::Sequence < beans::PropertyValue > aProps;
// export sub streams for package, else full stream into a file
-bool bWarn = false, bErr = false;
-OUString sWarnFile, sErrFile;
+bool bErr = false;
+OUString sErrFile;
uno::Reference< beans::XPropertySet>
xProp(_xStorageToSaveTo,uno::UNO_QUERY);
if ( xProp.is() )
@@ -1373,49 +1373,28 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
if( !bErr )
{
xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("settings.xml")));
-if( !WriteThroughComponent(
+WriteThroughComponent(
xCom, "settings.xml",
"com.sun.star.comp.report.XMLSettingsExporter",
-aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-{
-if( !bWarn )
-{
-bWarn = true;
-sWarnFile = "settings.xml";
-}
-}
+aDelegatorArguments, aProps, _xStorageToSaveTo );
}
if( !bErr )
{
xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("meta.xml")));
-if( !WriteThroughComponent(
+WriteThroughComponent(
xCom, "meta.xml",
"com.sun.star.comp.report.XMLMetaExporter",
-aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-{
-if( !bWarn )
-{
-bWarn = true;
-sWarnFile = "meta.xml";
-}
-}
+aDelegatorArguments, aProps, _xStorageToSaveTo );
}
if( !bErr )
{
xInfoSet->setPropertyValue("StreamName",
uno::makeAny(OUString("styles.xml")));
-if( !WriteThroughComponent(
+WriteThroughComponent(
xCom, "styles.xml",
"com.sun.star.comp.report.XMLStylesExporter",
-aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-{
-if( !bWarn )
-{
-bWarn = true;
-sWarnFile = "styles.xml";
-}
-}
+aDelegatorArguments, aProps, _xStorageToSaveTo );
}
[Libreoffice-commits] core.git: reportdesign/source sc/source
reportdesign/source/filter/xml/xmlExport.cxx |6 --
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 10 ++
2 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit fd0d4f845da5c247be0543db34de9615be8f81a7
Author: slideon
Date: Fri Apr 1 10:36:33 2016 -0400
Add default line width defines for TableBorders
This define makes things clearer.
Change-Id: Idd4abf11ed7657c688ea95aac1958ee4b1fd32ee
Reviewed-on: https://gerrit.libreoffice.org/23732
Tested-by: Jenkins
Reviewed-by: Eike Rathke
Tested-by: Eike Rathke
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx
b/reportdesign/source/filter/xml/xmlExport.cxx
index 2928520..7d01e8e 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -60,6 +60,8 @@
#include
+#define DEFAULT_LINE_WIDTH 2
+
namespace rptxml
{
using namespace xmloff;
@@ -1149,9 +1151,9 @@ void ORptExport::exportAutoStyle(XPropertySet*
_xProp,const ReferencegetPosition();
awt::Size aSize = xFixedLine->getSize();
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 436e0d6..7637027 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -49,6 +49,8 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
+#define DEFAULT_LINE_WIDTH 2
+
//= internal
ScAccessibleCellBase::ScAccessibleCellBase(
@@ -502,10 +504,10 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs()
aBottomBorder.Color = aColor.GetColor();
aLeftBorder.Color = aColor.GetColor();
aRightBorder.Color = aColor.GetColor();
-aTopBorder.OuterLineWidth =2;
-aBottomBorder.OuterLineWidth =2;
-aLeftBorder.OuterLineWidth =2;
-aRightBorder.OuterLineWidth =2;
+aTopBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
+aBottomBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
+aLeftBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
+aRightBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
}
//construct border attributes string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source sc/source sw/source
reportdesign/source/filter/xml/xmlFixedContent.cxx | 16
reportdesign/source/filter/xml/xmlFormattedField.cxx|2 +-
reportdesign/source/filter/xml/xmlReport.hxx|1 +
reportdesign/source/filter/xml/xmlReportElementBase.hxx |2 +-
sc/source/ui/vba/vbaformat.cxx | 12 +---
sc/source/ui/vba/vbastyle.cxx | 13 ++---
sc/source/ui/vba/vbastyle.hxx |1 +
sw/source/filter/ww8/wrtw8nds.cxx |3 ++-
sw/source/filter/ww8/wrtww8.cxx |1 +
sw/source/filter/ww8/wrtww8.hxx |1 +
10 files changed, 19 insertions(+), 33 deletions(-)
New commits:
commit ebd6fec73bfd77aa78a1ae92256d59d04ba999f3
Author: Noel Grandin
Date: Mon Oct 19 09:00:04 2015 +0200
Revert "cppcheck:duplInheritedMember"
This reverts commit a55496a9e88ac3da821b0ae0d334866d669540c6.
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 757a4f0..c18edf5 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -187,21 +187,21 @@ void OXMLFixedContent::EndElement()
uno::Reference< uno::XInterface> xInt =
xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
xControl->setDataField("rpt:" + m_sPageText);
-OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
-m_pInP->m_xReportComponent = xControl.get();
-m_xReportComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
+m_pInP->m_xComponent = xControl.get();
+m_xComponent = xControl.get();
}
else
{
Reference< XFixedText >
xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
-OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
-m_pInP->m_xReportComponent = xControl.get();
-m_xReportComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
+m_pInP->m_xComponent = xControl.get();
+m_xComponent = xControl.get();
xControl->setLabel(m_sLabel);
}
-m_pContainer->addCell(m_xReportComponent);
-m_rCell.setComponent(m_xReportComponent);
+m_pContainer->addCell(m_xComponent);
+m_rCell.setComponent(m_xComponent);
OXMLReportElementBase::EndElement();
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx
b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index b244cb8..47053d3 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
,bool _bPageCount) :
OXMLReportElementBase( rImport, nPrfx,
rLName,_xComponent.get(),_pContainer)
{
-OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
+OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx
b/reportdesign/source/filter/xml/xmlReport.hxx
index 13aa3cd..0a94525 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,6 +27,7 @@ namespace rptxml
class ORptFilter;
class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
{
+::com::sun::star::uno::Reference<
::com::sun::star::report::XReportDefinition > m_xComponent;
::std::vector< OUString> m_aMasterFields;
::std::vector< OUString> m_aDetailFields;
OXMLReport(const OXMLReport&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index ec14b63..c087dbd 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -44,7 +44,7 @@ namespace rptxml
protected:
ORptFilter& m_rImport;
OXMLTable*m_pContainer;
-::com::sun::star::uno::Reference<
::com::sun::star::report::XReportComponent > m_xReportComponent;
+::com::sun::star::uno::Reference<
::com::sun::star::report::XReportComponent > m_xComponent;
virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 1896a12..42aaa8f 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vb
[Libreoffice-commits] core.git: reportdesign/source sc/source sw/source
reportdesign/source/filter/xml/xmlFixedContent.cxx | 16
reportdesign/source/filter/xml/xmlFormattedField.cxx|2 +-
reportdesign/source/filter/xml/xmlReport.hxx|1 -
reportdesign/source/filter/xml/xmlReportElementBase.hxx |2 +-
sc/source/ui/vba/vbaformat.cxx | 12 +++-
sc/source/ui/vba/vbastyle.cxx | 13 +++--
sc/source/ui/vba/vbastyle.hxx |1 -
sw/source/filter/ww8/wrtw8nds.cxx |3 +--
sw/source/filter/ww8/wrtww8.cxx |1 -
sw/source/filter/ww8/wrtww8.hxx |1 -
10 files changed, 33 insertions(+), 19 deletions(-)
New commits:
commit a55496a9e88ac3da821b0ae0d334866d669540c6
Author: Noel Grandin
Date: Sat Oct 17 18:17:22 2015 +0200
cppcheck:duplInheritedMember
Change-Id: Ie525330eb79a80fd47a6bfe46343aa25ae0aeb5c
Reviewed-on: https://gerrit.libreoffice.org/19419
Reviewed-by: Noel Grandin
Tested-by: Noel Grandin
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index c18edf5..757a4f0 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -187,21 +187,21 @@ void OXMLFixedContent::EndElement()
uno::Reference< uno::XInterface> xInt =
xFactor->createInstance(SERVICE_FORMATTEDFIELD);
Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
xControl->setDataField("rpt:" + m_sPageText);
- OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
-m_pInP->m_xComponent = xControl.get();
-m_xComponent = xControl.get();
+OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
+m_pInP->m_xReportComponent = xControl.get();
+m_xReportComponent = xControl.get();
}
else
{
Reference< XFixedText >
xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
- OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
-m_pInP->m_xComponent = xControl.get();
-m_xComponent = xControl.get();
+OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
+m_pInP->m_xReportComponent = xControl.get();
+m_xReportComponent = xControl.get();
xControl->setLabel(m_sLabel);
}
-m_pContainer->addCell(m_xComponent);
-m_rCell.setComponent(m_xComponent);
+m_pContainer->addCell(m_xReportComponent);
+m_rCell.setComponent(m_xReportComponent);
OXMLReportElementBase::EndElement();
}
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx
b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 47053d3..b244cb8 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
,bool _bPageCount) :
OXMLReportElementBase( rImport, nPrfx,
rLName,_xComponent.get(),_pContainer)
{
-OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
+OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx
b/reportdesign/source/filter/xml/xmlReport.hxx
index 0a94525..13aa3cd 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,7 +27,6 @@ namespace rptxml
class ORptFilter;
class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
{
-::com::sun::star::uno::Reference<
::com::sun::star::report::XReportDefinition > m_xComponent;
::std::vector< OUString> m_aMasterFields;
::std::vector< OUString> m_aDetailFields;
OXMLReport(const OXMLReport&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index c087dbd..ec14b63 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -44,7 +44,7 @@ namespace rptxml
protected:
ORptFilter& m_rImport;
OXMLTable*m_pContainer;
-::com::sun::star::uno::Reference<
::com::sun::star::report::XReportComponent > m_xComponent;
+::com::sun::star::uno::Reference<
::com::sun::star::report::XReportComponent > m_xReportComponent;
virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
const OUString& rLocalName,
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbafor
[Libreoffice-commits] core.git: reportdesign/source sc/source unusedcode.easy vcl/inc vcl/unx
reportdesign/source/core/api/Section.cxx | 19 --
reportdesign/source/core/inc/Section.hxx |3 --
sc/source/ui/inc/tabview.hxx |1
sc/source/ui/view/tabview.cxx| 42 ---
unusedcode.easy |5 ++-
vcl/inc/unx/salgdi.h |4 --
vcl/unx/generic/gdi/salgdi2.cxx |6
7 files changed, 4 insertions(+), 76 deletions(-)
New commits:
commit a0183e89b7bb687f6fa09acbb72babdee9cdb6b0
Author: Caolán McNamara
Date: Thu Mar 5 09:15:19 2015 +
callcatcher: update unused code
Change-Id: I81b6f8af2b5c539b7adb507e787497b5ed51fa39
diff --git a/reportdesign/source/core/api/Section.cxx
b/reportdesign/source/core/api/Section.cxx
index 3ce3a2d..4650873 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -516,25 +516,6 @@ void SAL_CALL OSection::removeVetoableChangeListener(
const OUString& PropertyNa
SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener
);
}
-void OSection::lcl_copySection(const uno::Reference< report::XSection>&
_xSource,uno::Reference< report::XSection>& _xDest)
-{
-if ( _xSource.is() )
-{
-::comphelper::copyProperties(_xSource.get(),_xDest.get());
-sal_Int32 nCount = _xSource->getCount();
-for(sal_Int32 i = 0;i != nCount;++i)
-{
-uno::Reference
xClone(_xSource->getByIndex(i),uno::UNO_QUERY);
-OSL_ENSURE(xClone.is(),"No XCloneable interface found!");
-if ( xClone.is() )
-{
-uno::Reference< drawing::XShape>
xShape(xClone->createClone(),uno::UNO_QUERY);
-_xDest->add(xShape);
-}
-}
-}
-}
-
void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape )
throw (uno::RuntimeException, std::exception)
{
{
diff --git a/reportdesign/source/core/inc/Section.hxx
b/reportdesign/source/core/inc/Section.hxx
index f0a3031..03d06fc 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -228,9 +228,6 @@ namespace reportdesign
static OSection* getImplementation( const
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >&
_rxComponent );
static ::com::sun::star::uno::Sequence< sal_Int8 >
getUnoTunnelImplementationId();
-static void lcl_copySection(const ::com::sun::star::uno::Reference<
::com::sun::star::report::XSection>& _xSource
- ,::com::sun::star::uno::Reference<
::com::sun::star::report::XSection>& _xDest);
-
void notifyElementAdded(const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape);
void notifyElementRemoved(const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape);
};
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 63573ba..8d6010a 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -496,7 +496,6 @@ public:
Point GetMousePosPixel();
-voidSnapSplitPos( Point& rScreenPosPixel );
voidFreezeSplitters( bool bFreeze );
voidRemoveSplit();
voidSplitAtCursor();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 1f5f07c..24ab8ec 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1962,48 +1962,6 @@ bool lcl_MouseIsOverWin( const Point& rScreenPosPixel,
vcl::Window* pWin )
} // anonymous namespace
-void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
-{
-bool bOverWin = false;
-sal_uInt16 i;
-for (i=0; i<4; i++)
-if (lcl_MouseIsOverWin(rScreenPosPixel,pGridWin[i]))
-bOverWin = true;
-
-if (!bOverWin)
-return;
-
-// don't snap to cells if the scale will be modified afterwards
-if ( GetZoomType() != SVX_ZOOM_PERCENT )
-return;
-
-ScSplitPos ePos = SC_SPLIT_BOTTOMLEFT;
-if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
-ePos = SC_SPLIT_TOPLEFT;
-
-vcl::Window* pWin = pGridWin[ePos];
-if (!pWin)
-{
-OSL_FAIL("Window NULL");
-return;
-}
-
-Point aMouse = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel );
-SCsCOL nPosX;
-SCsROW nPosY;
-// bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des
Fensters
-aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY,
true, false, false );
-bool bLeft;
-bool bTop;
-aViewData.GetMouseQuadrant( aMouse, ePos, nPosX, nPosY, bLeft, bTop );
-if (!bLeft)
-++nPosX;
-if (!bTop)
-++nPosY;
-aMouse = aViewData.GetScrPos( static_cast(nPosX),
static_cast(nPosY), ePos, true );
-rScreenPosPixel = pWin->OutputToNormalizedScreenPixel( aMouse );
-}
-
void ScTabView::Free
