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
528514f1
Kaydet (Commit)
528514f1
authored
Kas 12, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sc: boost::ptr_vector->std::vector<std::unique_ptr>
Change-Id: I0861b86901e32aac3005cfe802cfed449f48f16a
üst
d47cb79e
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
output2.cxx
sc/source/ui/view/output2.cxx
+7
-6
No files found.
sc/source/ui/view/output2.cxx
Dosyayı görüntüle @
528514f1
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
#include <vcl/outdev.hxx>
#include <vcl/outdev.hxx>
#include <vcl/pdfextoutdevdata.hxx>
#include <vcl/pdfextoutdevdata.hxx>
#include <vcl/settings.hxx>
#include <vcl/settings.hxx>
#include <o3tl/make_unique.hxx>
#include "output.hxx"
#include "output.hxx"
#include "document.hxx"
#include "document.hxx"
...
@@ -66,8 +67,8 @@
...
@@ -66,8 +67,8 @@
#include <com/sun/star/i18n/DirectionProperty.hpp>
#include <com/sun/star/i18n/DirectionProperty.hpp>
#include <comphelper/string.hxx>
#include <comphelper/string.hxx>
#include <boost/ptr_container/ptr_vector.hpp>
#include <memory>
#include <memory>
#include <vector>
#include <math.h>
#include <math.h>
...
@@ -1471,7 +1472,7 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
...
@@ -1471,7 +1472,7 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
// alternative pattern instances in case we need to modify the pattern
// alternative pattern instances in case we need to modify the pattern
// before processing the cell value.
// before processing the cell value.
::
boost
::
ptr_vector
<
ScPatternAttr
>
aAltPatterns
;
std
::
vector
<
std
::
unique_ptr
<
ScPatternAttr
>
>
aAltPatterns
;
std
::
vector
<
long
>
aDX
;
std
::
vector
<
long
>
aDX
;
long
nPosY
=
nScrY
;
long
nPosY
=
nScrY
;
...
@@ -1615,8 +1616,8 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
...
@@ -1615,8 +1616,8 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
}
}
if
(
mpDoc
->
GetPreviewFont
()
||
mpDoc
->
GetPreviewCellStyle
()
)
if
(
mpDoc
->
GetPreviewFont
()
||
mpDoc
->
GetPreviewCellStyle
()
)
{
{
aAltPatterns
.
push_back
(
new
ScPatternAttr
(
*
pPattern
));
aAltPatterns
.
push_back
(
o3tl
::
make_unique
<
ScPatternAttr
>
(
*
pPattern
));
ScPatternAttr
*
pAltPattern
=
&
aAltPatterns
.
back
();
ScPatternAttr
*
pAltPattern
=
aAltPatterns
.
back
().
get
();
if
(
ScStyleSheet
*
pPreviewStyle
=
mpDoc
->
GetPreviewCellStyle
(
nCellX
,
nCellY
,
nTab
)
)
if
(
ScStyleSheet
*
pPreviewStyle
=
mpDoc
->
GetPreviewCellStyle
(
nCellX
,
nCellY
,
nTab
)
)
{
{
pAltPattern
->
SetStyleSheet
(
pPreviewStyle
);
pAltPattern
->
SetStyleSheet
(
pPreviewStyle
);
...
@@ -1639,8 +1640,8 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
...
@@ -1639,8 +1640,8 @@ Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, const ScA
pPattern
->
GetItem
(
ATTR_LINEBREAK
,
pCondSet
)).
GetValue
())
pPattern
->
GetItem
(
ATTR_LINEBREAK
,
pCondSet
)).
GetValue
())
{
{
// Disable line break when the cell content is numeric.
// Disable line break when the cell content is numeric.
aAltPatterns
.
push_back
(
new
ScPatternAttr
(
*
pPattern
));
aAltPatterns
.
push_back
(
o3tl
::
make_unique
<
ScPatternAttr
>
(
*
pPattern
));
ScPatternAttr
*
pAltPattern
=
&
aAltPatterns
.
back
();
ScPatternAttr
*
pAltPattern
=
aAltPatterns
.
back
().
get
();
SfxBoolItem
aLineBreak
(
ATTR_LINEBREAK
,
false
);
SfxBoolItem
aLineBreak
(
ATTR_LINEBREAK
,
false
);
pAltPattern
->
GetItemSet
().
Put
(
aLineBreak
);
pAltPattern
->
GetItemSet
().
Put
(
aLineBreak
);
pPattern
=
pAltPattern
;
pPattern
=
pAltPattern
;
...
...
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