Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
08e18475
Kaydet (Commit)
08e18475
authored
Ara 17, 2016
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
More blind fix attempt for MSVC
Change-Id: I023d79c0d8928d8b43df67996ca4eb9dc6bfb25e
üst
66b47664
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
com_MSC_defs.mk
solenv/gbuild/platform/com_MSC_defs.mk
+3
-0
XMLEmbeddedObjectImportContext.cxx
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
+2
-11
No files found.
solenv/gbuild/platform/com_MSC_defs.mk
Dosyayı görüntüle @
08e18475
...
@@ -115,6 +115,8 @@ gb_AFLAGS := $(AFLAGS)
...
@@ -115,6 +115,8 @@ gb_AFLAGS := $(AFLAGS)
# C4505: 'function' : unreferenced local function has been removed
# C4505: 'function' : unreferenced local function has been removed
# C4510: 'class' : default constructor could not be generated
# C4512: 'class' : assignment operator could not be generated
# C4512: 'class' : assignment operator could not be generated
# (an issue with MSVC 2013 that appears to be gone with MSVC 2015)
# (an issue with MSVC 2013 that appears to be gone with MSVC 2015)
...
@@ -186,6 +188,7 @@ gb_CXXFLAGS := \
...
@@ -186,6 +188,7 @@ gb_CXXFLAGS := \
-wd4351 \
-wd4351 \
-wd4373 \
-wd4373 \
-wd4505 \
-wd4505 \
-wd4510 \
-wd4512 \
-wd4512 \
-wd4611 \
-wd4611 \
-wd4706 \
-wd4706 \
...
...
xmloff/source/core/XMLEmbeddedObjectImportContext.cxx
Dosyayı görüntüle @
08e18475
...
@@ -134,16 +134,6 @@ void XMLEmbeddedObjectImportContext::SetComponent(
...
@@ -134,16 +134,6 @@ void XMLEmbeddedObjectImportContext::SetComponent(
xComp
=
rComp
;
// keep ref to component only if there is a handler
xComp
=
rComp
;
// keep ref to component only if there is a handler
}
}
namespace
{
struct
Entry
{
XMLTokenEnum
eClass
;
OUStringLiteral
sFilterService
;
Entry
()
=
delete
;
// avoid MSVC warning C4510
};
}
XMLEmbeddedObjectImportContext
::
XMLEmbeddedObjectImportContext
(
XMLEmbeddedObjectImportContext
::
XMLEmbeddedObjectImportContext
(
SvXMLImport
&
rImport
,
sal_uInt16
nPrfx
,
const
OUString
&
rLName
,
SvXMLImport
&
rImport
,
sal_uInt16
nPrfx
,
const
OUString
&
rLName
,
const
Reference
<
XAttributeList
>&
xAttrList
)
:
const
Reference
<
XAttributeList
>&
xAttrList
)
:
...
@@ -192,7 +182,8 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
...
@@ -192,7 +182,8 @@ XMLEmbeddedObjectImportContext::XMLEmbeddedObjectImportContext(
if
(
!
sClass
.
isEmpty
()
)
if
(
!
sClass
.
isEmpty
()
)
{
{
static
Entry
const
aServiceMap
[]
=
{
static
struct
{
XMLTokenEnum
eClass
;
OUStringLiteral
sFilterService
;
}
const
aServiceMap
[]
=
{
{
XML_TEXT
,
OUStringLiteral
(
XML_IMPORT_FILTER_WRITER
)
},
{
XML_TEXT
,
OUStringLiteral
(
XML_IMPORT_FILTER_WRITER
)
},
{
XML_ONLINE_TEXT
,
OUStringLiteral
(
XML_IMPORT_FILTER_WRITER
)
},
{
XML_ONLINE_TEXT
,
OUStringLiteral
(
XML_IMPORT_FILTER_WRITER
)
},
{
XML_SPREADSHEET
,
OUStringLiteral
(
XML_IMPORT_FILTER_CALC
)
},
{
XML_SPREADSHEET
,
OUStringLiteral
(
XML_IMPORT_FILTER_CALC
)
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment