[Libreoffice-commits] core.git: 3 commits - sc/source sd/source vcl/unx
sc/source/filter/lotus/lotimpop.cxx | 36 ++
sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx | 10 ---
sd/source/ui/inc/AccessibleDocumentViewBase.hxx |5 -
vcl/unx/gtk3/a11y/atkwrapper.hxx |1
vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx | 28 ++
5 files changed, 65 insertions(+), 15 deletions(-)
New commits:
commit 1bc297cb63e52b5cad3580ac5a3cb274c6dfcf66
Author: Caolán McNamara
AuthorDate: Wed Mar 24 09:30:18 2021 +
Commit: Caolán McNamara
CommitDate: Wed Mar 24 20:41:58 2021 +0100
cid#1474363 Untrusted value as argument
and...
cid#1474164 Untrusted value as argument
cid#1474033 Untrusted value as argument
cid#1473968 Untrusted value as argument
cid#1473922 Untrusted value as argument
cid#1473817 Untrusted value as argument
Change-Id: I19d3b758767c2b0cb4369257efbe477c37f231ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113027
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/sc/source/filter/lotus/lotimpop.cxx
b/sc/source/filter/lotus/lotimpop.cxx
index 78ff31f824ef..1fa5c14632e7 100644
--- a/sc/source/filter/lotus/lotimpop.cxx
+++ b/sc/source/filter/lotus/lotimpop.cxx
@@ -173,6 +173,12 @@ void ImportLotus::Errcell()
Read( aA );
+if (!rD.ValidAddress(aA))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScSetStringParam aParam;
aParam.setTextInput();
rD.EnsureTable(aA.Tab());
@@ -185,6 +191,12 @@ void ImportLotus::Nacell()
Read( aA );
+if (!rD.ValidAddress(aA))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScSetStringParam aParam;
aParam.setTextInput();
rD.EnsureTable(aA.Tab());
@@ -201,6 +213,12 @@ void ImportLotus::Labelcell()
Read( cAlign );
Read( aLabel );
+if (!rD.ValidAddress(aA))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScSetStringParam aParam;
aParam.setTextInput();
rD.EnsureTable(aA.Tab());
@@ -215,6 +233,12 @@ void ImportLotus::Numbercell()
Read( aAddr );
Read( fVal );
+if (!rD.ValidAddress(aAddr))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
rD.EnsureTable(aAddr.Tab());
rD.SetValue(aAddr, fVal);
}
@@ -227,6 +251,12 @@ void ImportLotus::Smallnumcell()
Read( aAddr );
Read( nVal );
+if (!rD.ValidAddress(aAddr))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
rD.EnsureTable(aAddr.Tab());
rD.SetValue(aAddr, SnumToDouble(nVal));
}
@@ -251,6 +281,12 @@ void ImportLotus::Formulacell( sal_uInt16 n )
if (!aConv.good())
return;
+if (!rD.ValidAddress(aAddr))
+{
+SAL_WARN("sc.filter", "invalid address");
+return;
+}
+
ScFormulaCell* pCell = pErg ? new ScFormulaCell(rD, aAddr,
std::move(pErg)) : new ScFormulaCell(rD, aAddr);
pCell->AddRecalcMode( ScRecalcMode::ONLOAD_ONCE );
rD.EnsureTable(aAddr.Tab());
commit c72a00868cd13be911798d2c508c10b6367606ab
Author: Caolán McNamara
AuthorDate: Tue Mar 23 13:13:37 2021 +
Commit: Caolán McNamara
CommitDate: Wed Mar 24 20:39:29 2021 +0100
Related: tdf#135363 don't keep a reference to the vcl::Window
in fact, why keep a VclPtr reference to that window at all
Change-Id: I3f0511b41434cba744a63d4a9e185c97a6cef5e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112992
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index a819ca19b3e4..2e198ba8827e 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -66,7 +66,6 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
pViewShell->GetDoc()->GetDocumentType() ==
DocumentType::Impress ?
AccessibleRole::DOCUMENT_PRESENTATION :
AccessibleRole::DOCUMENT),
- mpWindow (pSdWindow),
mxController (rxController),
maViewForwarder (
static_cast(pViewShell->GetView()),
@@ -88,17 +87,10 @@ AccessibleDocumentViewBase::AccessibleDocumentViewBase (
mpViewShell = pViewShell;
}
-void AccessibleDocumentViewBase::ReleaseWindow()
-{
-SolarMutexGuard g;
-mpWindow.reset();
-}
-
AccessibleDocumentViewBase::~AccessibleDocumentViewBase()
{
// At this place we should be disposed. You may want to add a
// corresponding assertion into the destructor of a derived class.
-ReleaseWindow(); // this should already be done by impl_dispose
}
void AccessibleDocumentViewBase::Init()
@@ -488,8 +480,6 @@ void
[Libreoffice-commits] core.git: 3 commits - sc/source sd/source sfx2/source
sc/source/ui/dataprovider/dataprovider.cxx |5 -
sc/source/ui/dataprovider/htmldataprovider.hxx |2 +-
sc/source/ui/inc/dataprovider.hxx |2 --
sd/source/ui/dlg/BulletAndPositionDlg.cxx |8
sd/source/ui/inc/BulletAndPositionDlg.hxx |1 -
sfx2/source/doc/sfxbasemodel.cxx |5 -
sfx2/source/inc/docundomanager.hxx |6 +-
7 files changed, 2 insertions(+), 27 deletions(-)
New commits:
commit ab5805c34af1ad45a2ee8983b0e451704ab33c09
Author: Noel Grandin
AuthorDate: Mon Jun 10 08:37:11 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Jun 11 07:52:27 2019 +0200
loplugin:virtualdown in SfxModelSubComponent
Change-Id: Ied6f58301a648404c988184b67e1acb3fa1133de
Reviewed-on: https://gerrit.libreoffice.org/73766
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 4caf74eb15c6..4d1833e31d11 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -4447,9 +4447,4 @@ SfxModelSubComponent::~SfxModelSubComponent()
{
}
-void SfxModelSubComponent::disposing()
-{
-// nothing to do here
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/docundomanager.hxx
b/sfx2/source/inc/docundomanager.hxx
index ab713c1d50e2..ce38680e264f 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -41,9 +41,6 @@ public:
m_rModel.MethodEntryCheck( true );
}
-// called when the SfxBaseModel which the component is superordinate of is
being disposed
-virtual void disposing();
-
protected:
SfxModelSubComponent( SfxBaseModel& i_model )
:m_rModel( i_model )
@@ -109,8 +106,7 @@ namespace sfx2
DocumentUndoManager(const DocumentUndoManager&) = delete;
DocumentUndoManager& operator=(const DocumentUndoManager&) = delete;
-// SfxModelSubComponent overridables
-virtual voiddisposing() override;
+voiddisposing();
// non-UNO API for our owner
/** determines whether we have an open Undo context. No mutex locking
within this method, no disposal check - this
commit 27d5fd27cbf4ed91bafb4f051a418494506ea6f6
Author: Noel Grandin
AuthorDate: Mon Jun 10 08:36:54 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Jun 11 07:52:23 2019 +0200
loplugin:virtualdown in SvxBulletAndPositionDlg
Change-Id: I98da96a09a61fe8a197065773d649dc55d6095b7
Reviewed-on: https://gerrit.libreoffice.org/73765
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 6575850c6a6b..bbf5c6687bd8 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -287,14 +287,6 @@
SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf
SvxBulletAndPositionDlg::~SvxBulletAndPositionDlg() {}
-void SvxBulletAndPositionDlg::dispose()
-{
-m_xPreviewWIN.reset();
-m_xBulColLB.reset();
-pActNum.reset();
-pSaveNum.reset();
-}
-
void SvxBulletAndPositionDlg::SetMetric(FieldUnit eMetric)
{
if (eMetric == FieldUnit::MM)
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx
b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index fb95af11c6f0..fe16cdd539ab 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -145,7 +145,6 @@ class SvxBulletAndPositionDlg : public
weld::GenericDialogController
public:
SvxBulletAndPositionDlg(weld::Window* pWindow, const SfxItemSet& rSet,
::sd::View* pView);
virtual ~SvxBulletAndPositionDlg() override;
-virtual void dispose();
SfxItemSet* GetOutputItemSet(SfxItemSet* rSet);
bool IsApplyToMaster();
commit fa1e5e556349bc4ae92275ce88d877db91f6a44b
Author: Noel Grandin
AuthorDate: Mon Jun 10 08:36:32 2019 +0200
Commit: Noel Grandin
CommitDate: Tue Jun 11 07:52:15 2019 +0200
loplugin:virtualdown in DataProvider
Change-Id: Id61d2ddc25767c642e13212be8b00c5836ce4996
Reviewed-on: https://gerrit.libreoffice.org/73764
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/sc/source/ui/dataprovider/dataprovider.cxx
b/sc/source/ui/dataprovider/dataprovider.cxx
index e0a5571971d2..f87e006618ec 100644
--- a/sc/source/ui/dataprovider/dataprovider.cxx
+++ b/sc/source/ui/dataprovider/dataprovider.cxx
@@ -212,11 +212,6 @@ void DataProvider::setDeterministic()
mbDeterministic = true;
}
-std::map DataProvider::getDataSourcesForURL(const
OUString& /*rURL*/)
-{
-return std::map();
-}
-
DataProvider::~DataProvider()
{
}
diff --git a/sc/source/ui/dataprovider/htmldataprovider.hxx
b/sc/source/ui/dataprovider/htmldataprovider.hxx
index 249249dcef88..0eb27f4b8891 100644
---
[Libreoffice-commits] core.git: 3 commits - sc/source sd/source sfx2/sdi svx/sdi sw/source
sc/source/ui/drawfunc/drtxtob1.cxx |2 +-
sc/source/ui/view/editsh.cxx |2 +-
sd/source/ui/func/fuchar.cxx |2 +-
sfx2/sdi/sfx.sdi | 20 ++--
svx/sdi/svx.sdi | 20 ++--
sw/source/uibase/shells/annotsh.cxx |4 +---
sw/source/uibase/shells/drwtxtex.cxx |4 +---
7 files changed, 25 insertions(+), 29 deletions(-)
New commits:
commit 342c8c9da8f0eb36d2aaeb810e3946e8a09b8a0a
Author: Maxim Monastirsky momonas...@gmail.com
Date: Wed Sep 3 17:50:56 2014 +0300
These slots not meant to be added to a toolbar or recorded
Change-Id: Iaf847c02265fcc7d75c1cd54bc836ec85cb830ec
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index d72d23d..f893324 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -6167,15 +6167,15 @@ SfxVoidItem StyleEndPreview SID_STYLE_END_PREVIEW
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
-RecordPerSet;
+NoRecord;
Synchron;
/* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = GID_TEMPLATE;
+ToolBoxConfig = FALSE,
+GroupId = ;
]
SfxVoidItem StylePreview SID_STYLE_PREVIEW
@@ -6191,15 +6191,15 @@ SfxVoidItem StylePreview SID_STYLE_PREVIEW
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
-RecordPerSet;
+NoRecord;
Synchron;
/* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = GID_TEMPLATE;
+ToolBoxConfig = FALSE,
+GroupId = ;
]
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 10b254f..839b243 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1691,17 +1691,17 @@ SvxFontItem CharPreviewFontName
SID_ATTR_CHAR_PREVIEW_FONT
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
-RecordPerSet;
+NoRecord;
Synchron;
Readonly = FALSE,
/* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = GID_FORMAT;
+ToolBoxConfig = FALSE,
+GroupId = ;
]
SvxFontItem CharEndPreviewFontName SID_ATTR_CHAR_ENDPREVIEW_FONT
@@ -1717,17 +1717,17 @@ SvxFontItem CharEndPreviewFontName
SID_ATTR_CHAR_ENDPREVIEW_FONT
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
-RecordPerSet;
+NoRecord;
Synchron;
Readonly = FALSE,
/* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
StatusBarConfig = FALSE,
-ToolBoxConfig = TRUE,
-GroupId = GID_FORMAT;
+ToolBoxConfig = FALSE,
+GroupId = ;
]
commit e201506a4cc7e1cac2d04ef3169ef37e34de379a
Author: Maxim Monastirsky momonas...@gmail.com
Date: Sun Aug 31 01:52:52 2014 +0300
Show the right tab for SID_CHAR_DLG_EFFECT
Change-Id: I3a8b7a9e973d20f06d423ec55cf689478ca98e0a
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx
b/sc/source/ui/drawfunc/drtxtob1.cxx
index d364ef2..6c12b0d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -53,7 +53,7 @@ bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet
rArgs,
assert(pDlg Dialog create fail!);
if (nSlot == SID_CHAR_DLG_EFFECT)
{
-pDlg-SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+pDlg-SetCurPageId(fonteffects);
}
bool bRet = ( pDlg-Execute() == RET_OK );
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index f0ffb70..5ab8b2b 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -460,7 +460,7 @@ void ScEditShell::Execute( SfxRequest rReq )
OSL_ENSURE(pDlg, Dialog create fail!);
if (nSlot == SID_CHAR_DLG_EFFECT)
{
-pDlg-SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+pDlg-SetCurPageId(fonteffects);
}
short nRet = pDlg-Execute();
// pDlg is needed below
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 222634c..8b929c3 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -77,7 +77,7 @@ void FuChar::DoExecute( SfxRequest rReq )
{
if (rReq.GetSlot() == SID_CHAR_DLG_EFFECT)
{
-pDlg-SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+pDlg-SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
}
nResult = pDlg-Execute();
commit f3cec45a2e240fcf4ab84e77d51e2b700492f830
Author: Maxim Monastirsky momonas...@gmail.com
Date: Sun Aug 31 01:01:21 2014 +0300
Simplify this
No other SIDs here have any args anyway.
[Libreoffice-commits] core.git: 3 commits - sc/source sd/source sfx2/source sw/source
sc/source/filter/excel/expop2.cxx |3 ---
sc/source/filter/xml/xmlwrap.cxx|2 --
sd/source/ui/docshell/docshel4.cxx | 11 ---
sfx2/source/doc/objcont.cxx |4 +---
sfx2/source/doc/objstor.cxx |2 ++
sfx2/source/doc/objxtor.cxx |2 +-
sw/source/core/uibase/app/docsh.cxx |1 -
sw/source/filter/xml/xmlexp.cxx |4
8 files changed, 4 insertions(+), 25 deletions(-)
New commits:
commit 6e87f0bb75734e464bb0160dc00ab2fbe1a8fac3
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:50:39 2014 +0200
Update also revision and editing time when setting 'modified' properties.
Change-Id: Id756ef6dd62ca8df2e62265b9cc930f07d13f2e3
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index bea59cd..7bba8d6 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -208,9 +208,7 @@ void SfxObjectShell::UpdateDocInfoForSave()
now.GetHour(), now.GetDay(), now.GetMonth(),
now.GetYear(), false) );
xDocProps-setModifiedBy( aUserName );
-if ( !HasName() || pImp-bIsSaving )
-// QUESTION: not in case of real SaveAs as this is meant to
create a new document
-UpdateTime_Impl( xDocProps );
+UpdateTime_Impl( xDocProps );
}
}
}
commit fee87c6fda46923a564cd2574827a7beeffb1a1f
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 13:42:55 2014 +0200
Use proper constructor to fill with system time.
Probably 86adb5cacb4fe3e7fb869299447da5876f0da30d did not mean to change
the behaviour here.
Change-Id: If39c150973c502323b3c785a9738cf65cdd74e5d
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 29fe983..b0b2347 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -209,7 +209,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell
_rDocShell )
,rDocShell( _rDocShell )
,aMacroMode( *this )
,pProgress( 0)
-,nTime( DateTime::EMPTY )
+,nTime( DateTime::SYSTEM )
,nVisualDocumentNumber( USHRT_MAX)
,nDocumentSignatureState( SIGNATURESTATE_UNKNOWN )
,nScriptingSignatureState( SIGNATURESTATE_UNKNOWN )
commit 5c2ab70cc2dfb7cf0c2418433b3aa89d225742a4
Author: Matúš Kukan matus.ku...@collabora.com
Date: Thu May 22 10:11:38 2014 +0200
cp#177: Set 'modified' document property more consistently.
Update document info at one place, so that it works for other formats
like .doc, .docx, ... too.
Change-Id: If71799b491d2210f0d3bdbdb05f91f26c986a260
diff --git a/sc/source/filter/excel/expop2.cxx
b/sc/source/filter/excel/expop2.cxx
index 8f9ebf9..f1453e9 100644
--- a/sc/source/filter/excel/expop2.cxx
+++ b/sc/source/filter/excel/expop2.cxx
@@ -88,9 +88,6 @@ FltError ExportBiff5::Write()
if( pDocShell xRootStrg.Is() )
{
-// #i88642# update doc info (revision etc)
-pDocShell-UpdateDocInfoForSave();
-
using namespace ::com::sun::star;
uno::Referencedocument::XDocumentPropertiesSupplier xDPS(
pDocShell-GetModel(), uno::UNO_QUERY_THROW);
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 640890b..a9e8dd9 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -788,8 +788,6 @@ bool ScXMLImportWrapper::Export(bool bStylesOnly)
if ( pObjSh xStorage.is() )
{
-pObjSh-UpdateDocInfoForSave(); // update information
-
uno::Referenceframe::XModel xModel(pObjSh-GetModel());
uno::Referencetask::XStatusIndicator
xStatusIndicator(GetStatusIndicator());
sal_Int32 nProgressRange(100);
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index b61aa45..654d6a8 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -506,12 +506,7 @@ bool DrawDocShell::Save()
bool bRet = SfxObjectShell::Save();
if( bRet )
-{
-// Call UpdateDocInfoForSave() before export
-UpdateDocInfoForSave();
-
bRet = SdXMLFilter( *GetMedium(), *this, true, SDXMLMODE_Normal,
SotStorage::GetVersion( GetMedium()-GetStorage() ) ).Export();
-}
return bRet;
}
@@ -545,11 +540,7 @@ bool DrawDocShell::SaveAs( SfxMedium rMedium )
boolbRet = SfxObjectShell::SaveAs( rMedium );
if( bRet )
-{
-// Call UpdateDocInfoForSave() before export
-UpdateDocInfoForSave();
bRet = SdXMLFilter( rMedium, *this, true, SDXMLMODE_Normal,
SotStorage::GetVersion( rMedium.GetStorage() ) ).Export();
-}
if( GetError() == ERRCODE_NONE )
SetError( nVBWarning, OSL_LOG_PREFIX );
@@ -587,13 +578,11 @@ bool DrawDocShell::ConvertTo( SfxMedium rMedium )
aTypeName.indexOf( impress8 ) = 0 )
{
pFilter = new SdXMLFilter(
[Libreoffice-commits] core.git: 3 commits - sc/source sd/source
sc/source/ui/view/editsh.cxx| 12 +++-
sd/source/ui/remotecontrol/WINNetworkService.cxx|7 ++-
sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c | 11 ---
3 files changed, 21 insertions(+), 9 deletions(-)
New commits:
commit 4a01706377c6e1e7528f0536e4edf60d4cff5504
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Aug 16 23:46:27 2013 +0300
WaE: C4204: nonstandard extension used : non-constant aggregate initializer
Change-Id: I5f34209ad4ea5b97e12cb7073fcf1cf2264ebcf3
diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
index fb4ae95..5dcc196 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
@@ -1492,7 +1492,9 @@ DNSServiceErrorType DNSSD_API DNSServiceRegister
size_t len;
ipc_msg_hdr *hdr;
DNSServiceErrorType err;
-union { uint16_t s; u_char b[2]; } port = { PortInNetworkByteOrder };
+union { uint16_t s; u_char b[2]; } port;
+
+port.s = PortInNetworkByteOrder;
if (!name) name = ;
if (!regtype) return kDNSServiceErr_BadParam;
@@ -1975,12 +1977,15 @@ DNSServiceErrorType DNSSD_API
DNSServiceNATPortMappingCreate
char *ptr;
size_t len;
ipc_msg_hdr *hdr;
-union { uint16_t s; u_char b[2]; } internalPort = {
internalPortInNetworkByteOrder };
-union { uint16_t s; u_char b[2]; } externalPort = {
externalPortInNetworkByteOrder };
+union { uint16_t s; u_char b[2]; } internalPort;
+union { uint16_t s; u_char b[2]; } externalPort;
DNSServiceErrorType err = ConnectToServer(sdRef, flags,
port_mapping_request, handle_port_mapping_response, callBack, context);
if (err) return err;// On error ConnectToServer leaves *sdRef set to
NULL
+internalPort.s = internalPortInNetworkByteOrder;
+externalPort.s = externalPortInNetworkByteOrder;
+
len = sizeof(flags);
len += sizeof(interfaceIndex);
len += sizeof(protocol);
commit ddba5a4360e88ac4f6f848ac74ab1f350b9b7d5f
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Aug 16 23:42:22 2013 +0300
SAL_INFO is not available here
Change-Id: Ic40cb29d9ade32690903bfa0f3993782711cc53f
diff --git a/sd/source/ui/remotecontrol/WINNetworkService.cxx
b/sd/source/ui/remotecontrol/WINNetworkService.cxx
index 6e35f05..144b33a 100755
--- a/sd/source/ui/remotecontrol/WINNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/WINNetworkService.cxx
@@ -7,13 +7,10 @@ void sd::WINNetworkService::setup()
{
DNSServiceErrorType err = DNSServiceRegister(client, 0, 0, NULL,
kREG_TYPE, local, NULL, 1599, 1, , NULL, this );
-if ( err == 0 ) {
-SAL_INFO(sd, Windows bonjour service setup);
-} // Fail silently otherwise
+// Fail silently
}
void sd::WINNetworkService::clear()
{
DNSServiceRefDeallocate(client);
-SAL_INFO(sd, Windows mDNSResponder removed);
-}
\ No newline at end of file
+}
commit a0161828b8ea4d68fb34f02656b9a4f8604129ab
Author: Tor Lillqvist tlillqv...@suse.com
Date: Fri Aug 16 22:17:44 2013 +0300
WaE: C4305: 'argument' : truncation from 'int' to 'const bool'
Change-Id: I92729c7272e87c2aede6cd5134c84d17b466e57f
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 76a9529..a4b45a9 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -670,7 +670,17 @@ void ScEditShell::GetState( SfxItemSet rSet )
if ( pActiveView )
rSet.Put( SfxBoolItem( nWhich,
pActiveView-IsInsertMode() ) );
else
-rSet.Put( SfxBoolItem( nWhich, 42 ) );
+{
+// Here the code used to pass the value 42 and it used
+// to work without warnings because the SfxBoolItem
+// was based on 'sal_Bool', which is actually 'unsigned
+// char'. But now it uses actual 'bool', and passing 42
+// for a 'bool' parameter causes a warning at least
with
+// MSVC. So use 'true'. I really really hope there is
+// not code somewhere that retrieves this boolean
item
+// and checks it value for the magic value 42...
+rSet.Put( SfxBoolItem( nWhich, true) );
+}
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
