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
3d869cda
Kaydet (Commit)
3d869cda
authored
Ock 30, 2014
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#74014: Brodcast only when pasting, not during file import.
Change-Id: I7cca5d459491fca782f24093dcdd7d0c1c69bdc9
üst
59239c29
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
7 deletions
+14
-7
ucalc.cxx
sc/qa/unit/ucalc.cxx
+1
-0
impex.cxx
sc/source/ui/docshell/impex.cxx
+10
-7
impex.hxx
sc/source/ui/inc/impex.hxx
+2
-0
viewfun5.cxx
sc/source/ui/view/viewfun5.cxx
+1
-0
No files found.
sc/qa/unit/ucalc.cxx
Dosyayı görüntüle @
3d869cda
...
...
@@ -5194,6 +5194,7 @@ void Test::testImportStream()
aOpt
.
SetFieldSeps
(
","
);
ScImportExport
aObj
(
m_pDoc
,
ScAddress
(
0
,
0
,
0
));
aObj
.
SetImportBroadcast
(
true
);
aObj
.
SetExtOptions
(
aOpt
);
aObj
.
ImportString
(
"1,2,3"
,
FORMAT_STRING
);
...
...
sc/source/ui/docshell/impex.cxx
Dosyayı görüntüle @
3d869cda
...
...
@@ -89,7 +89,7 @@ ScImportExport::ScImportExport( ScDocument* p )
bFormulas
(
false
),
bIncludeFiltered
(
true
),
bAll
(
true
),
bSingle
(
true
),
bUndo
(
false
),
bOverflowRow
(
false
),
bOverflowCol
(
false
),
bOverflowCell
(
false
),
mbApi
(
true
),
mExportTextOptions
()
mbApi
(
true
),
m
bImportBroadcast
(
false
),
m
ExportTextOptions
()
{
pUndoDoc
=
NULL
;
pExtOptions
=
NULL
;
...
...
@@ -105,7 +105,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScAddress& rPt )
bFormulas
(
false
),
bIncludeFiltered
(
true
),
bAll
(
false
),
bSingle
(
true
),
bUndo
(
pDocSh
!=
NULL
),
bOverflowRow
(
false
),
bOverflowCol
(
false
),
bOverflowCell
(
false
),
mbApi
(
true
),
mExportTextOptions
()
mbApi
(
true
),
m
bImportBroadcast
(
false
),
m
ExportTextOptions
()
{
pUndoDoc
=
NULL
;
pExtOptions
=
NULL
;
...
...
@@ -122,7 +122,7 @@ ScImportExport::ScImportExport( ScDocument* p, const ScRange& r )
bFormulas
(
false
),
bIncludeFiltered
(
true
),
bAll
(
false
),
bSingle
(
false
),
bUndo
(
pDocSh
!=
NULL
),
bOverflowRow
(
false
),
bOverflowCol
(
false
),
bOverflowCell
(
false
),
mbApi
(
true
),
mExportTextOptions
()
mbApi
(
true
),
m
bImportBroadcast
(
false
),
m
ExportTextOptions
()
{
pUndoDoc
=
NULL
;
pExtOptions
=
NULL
;
...
...
@@ -140,7 +140,7 @@ ScImportExport::ScImportExport( ScDocument* p, const OUString& rPos )
bFormulas
(
false
),
bIncludeFiltered
(
true
),
bAll
(
false
),
bSingle
(
true
),
bUndo
(
pDocSh
!=
NULL
),
bOverflowRow
(
false
),
bOverflowCol
(
false
),
bOverflowCell
(
false
),
mbApi
(
true
),
mExportTextOptions
()
mbApi
(
true
),
m
bImportBroadcast
(
false
),
m
ExportTextOptions
()
{
pUndoDoc
=
NULL
;
pExtOptions
=
NULL
;
...
...
@@ -947,7 +947,7 @@ bool ScImportExport::Text2Doc( SvStream& rStrm )
}
EndPaste
();
if
(
bOk
)
if
(
bOk
&&
mbImportBroadcast
)
{
pDoc
->
BroadcastCells
(
aRange
,
SC_HINT_DATACHANGED
);
pDocSh
->
PostDataChanged
();
...
...
@@ -1490,8 +1490,11 @@ bool ScImportExport::ExtText2Doc( SvStream& rStrm )
if
(
bRangeIsDetermined
)
EndPaste
(
false
);
pDoc
->
BroadcastCells
(
aRange
,
SC_HINT_DATACHANGED
);
pDocSh
->
PostDataChanged
();
if
(
mbImportBroadcast
)
{
pDoc
->
BroadcastCells
(
aRange
,
SC_HINT_DATACHANGED
);
pDocSh
->
PostDataChanged
();
}
return
true
;
}
...
...
sc/source/ui/inc/impex.hxx
Dosyayı görüntüle @
3d869cda
...
...
@@ -65,6 +65,7 @@ class ScImportExport
bool
bOverflowCol
;
// too many columns
bool
bOverflowCell
;
// too much data for a cell
bool
mbApi
;
bool
mbImportBroadcast
;
// whether or not to broadcast after data import.
ScExportTextOptions
mExportTextOptions
;
ScAsciiOptions
*
pExtOptions
;
// extended options
...
...
@@ -151,6 +152,7 @@ public:
bool
IsApi
()
const
{
return
mbApi
;
}
void
SetApi
(
bool
bApi
)
{
mbApi
=
bApi
;
}
void
SetImportBroadcast
(
bool
b
)
{
mbImportBroadcast
=
b
;
}
const
ScExportTextOptions
&
GetExportTextOptions
()
{
return
mExportTextOptions
;
}
void
SetExportTextOptions
(
const
ScExportTextOptions
&
options
)
{
mExportTextOptions
=
options
;
}
};
...
...
sc/source/ui/view/viewfun5.cxx
Dosyayı görüntüle @
3d869cda
...
...
@@ -288,6 +288,7 @@ sal_Bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
{
ScAddress
aCellPos
(
nPosX
,
nPosY
,
GetViewData
()
->
GetTabNo
()
);
ScImportExport
aObj
(
GetViewData
()
->
GetDocument
(),
aCellPos
);
aObj
.
SetImportBroadcast
(
true
);
OUString
aStr
;
SotStorageStreamRef
xStream
;
...
...
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