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
8724aa7d
Kaydet (Commit)
8724aa7d
authored
Kas 29, 2011
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Passed the selected sheet info to ScPreview.
üst
12854c32
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
6 deletions
+25
-6
markdata.hxx
sc/inc/markdata.hxx
+5
-1
markdata.cxx
sc/source/core/data/markdata.cxx
+10
-4
preview.hxx
sc/source/ui/inc/preview.hxx
+4
-0
preview.cxx
sc/source/ui/view/preview.cxx
+5
-1
prevwsh.cxx
sc/source/ui/view/prevwsh.cxx
+1
-0
No files found.
sc/inc/markdata.hxx
Dosyayı görüntüle @
8724aa7d
...
@@ -45,11 +45,14 @@ class ScRangeList;
...
@@ -45,11 +45,14 @@ class ScRangeList;
class
SC_DLLPUBLIC
ScMarkData
class
SC_DLLPUBLIC
ScMarkData
{
{
public
:
typedef
std
::
set
<
SCTAB
>
MarkedTabsType
;
private
:
private
:
MarkedTabsType
maTabMarked
;
ScRange
aMarkRange
;
// area
ScRange
aMarkRange
;
// area
ScRange
aMultiRange
;
// maximum area altogether
ScRange
aMultiRange
;
// maximum area altogether
ScMarkArray
*
pMultiSel
;
// multi selection
ScMarkArray
*
pMultiSel
;
// multi selection
::
std
::
set
<
SCTAB
>
maTabMarked
;
bool
bMarked
:
1
;
// rectangle marked
bool
bMarked
:
1
;
// rectangle marked
bool
bMultiMarked
:
1
;
bool
bMultiMarked
:
1
;
...
@@ -86,6 +89,7 @@ public:
...
@@ -86,6 +89,7 @@ public:
SCTAB
GetSelectCount
()
const
;
SCTAB
GetSelectCount
()
const
;
SCTAB
GetFirstSelected
()
const
;
SCTAB
GetFirstSelected
()
const
;
SCTAB
GetLastSelected
()
const
;
SCTAB
GetLastSelected
()
const
;
void
GetSelectedTabs
(
MarkedTabsType
&
rTabs
)
const
;
void
SetMarkNegative
(
bool
bFlag
)
{
bMarkIsNeg
=
bFlag
;
}
void
SetMarkNegative
(
bool
bFlag
)
{
bMarkIsNeg
=
bFlag
;
}
bool
IsMarkNegative
()
const
{
return
bMarkIsNeg
;
}
bool
IsMarkNegative
()
const
{
return
bMarkIsNeg
;
}
...
...
sc/source/core/data/markdata.cxx
Dosyayı görüntüle @
8724aa7d
...
@@ -40,17 +40,17 @@
...
@@ -40,17 +40,17 @@
//------------------------------------------------------------------------
//------------------------------------------------------------------------
ScMarkData
::
ScMarkData
()
:
ScMarkData
::
ScMarkData
()
:
pMultiSel
(
NULL
),
maTabMarked
(
),
maTabMarked
(
)
pMultiSel
(
NULL
)
{
{
ResetMark
();
ResetMark
();
}
}
ScMarkData
::
ScMarkData
(
const
ScMarkData
&
rData
)
:
ScMarkData
::
ScMarkData
(
const
ScMarkData
&
rData
)
:
maTabMarked
(
rData
.
maTabMarked
),
aMarkRange
(
rData
.
aMarkRange
),
aMarkRange
(
rData
.
aMarkRange
),
aMultiRange
(
rData
.
aMultiRange
),
aMultiRange
(
rData
.
aMultiRange
),
pMultiSel
(
NULL
),
pMultiSel
(
NULL
)
maTabMarked
(
rData
.
maTabMarked
)
{
{
bMarked
=
rData
.
bMarked
;
bMarked
=
rData
.
bMarked
;
bMultiMarked
=
rData
.
bMultiMarked
;
bMultiMarked
=
rData
.
bMultiMarked
;
...
@@ -228,6 +228,12 @@ SCTAB ScMarkData::GetLastSelected() const
...
@@ -228,6 +228,12 @@ SCTAB ScMarkData::GetLastSelected() const
return
0
;
return
0
;
}
}
void
ScMarkData
::
GetSelectedTabs
(
MarkedTabsType
&
rTabs
)
const
{
MarkedTabsType
aTabs
(
maTabMarked
.
begin
(),
maTabMarked
.
end
());
rTabs
.
swap
(
aTabs
);
}
void
ScMarkData
::
MarkToMulti
()
void
ScMarkData
::
MarkToMulti
()
{
{
if
(
bMarked
&&
!
bMarking
)
if
(
bMarked
&&
!
bMarking
)
...
...
sc/source/ui/inc/preview.hxx
Dosyayı görüntüle @
8724aa7d
...
@@ -31,6 +31,7 @@
...
@@ -31,6 +31,7 @@
#include <vcl/window.hxx>
#include <vcl/window.hxx>
#include "printfun.hxx" // ScPrintState
#include "printfun.hxx" // ScPrintState
#include "markdata.hxx"
#include <vector>
#include <vector>
...
@@ -41,6 +42,7 @@ class FmFormView;
...
@@ -41,6 +42,7 @@ class FmFormView;
class
ScPreview
:
public
Window
class
ScPreview
:
public
Window
{
{
private
:
private
:
ScMarkData
::
MarkedTabsType
maSelectedTabs
;
// eingestellt:
// eingestellt:
long
nPageNo
;
// Seite im Dokument
long
nPageNo
;
// Seite im Dokument
sal_uInt16
nZoom
;
// eingestellter Zoom
sal_uInt16
nZoom
;
// eingestellter Zoom
...
@@ -167,6 +169,8 @@ public:
...
@@ -167,6 +169,8 @@ public:
static
void
StaticInvalidate
();
static
void
StaticInvalidate
();
FmFormView
*
GetDrawView
()
{
return
pDrawView
;
}
FmFormView
*
GetDrawView
()
{
return
pDrawView
;
}
void
SetSelectedTabs
(
const
ScMarkData
&
rMark
);
};
};
...
...
sc/source/ui/view/preview.cxx
Dosyayı görüntüle @
8724aa7d
...
@@ -1545,6 +1545,10 @@ void ScPreview::DrawInvert( long nDragPos, sal_uInt16 nFlags )
...
@@ -1545,6 +1545,10 @@ void ScPreview::DrawInvert( long nDragPos, sal_uInt16 nFlags )
Invert
(
aRect
,
INVERT_50
);
Invert
(
aRect
,
INVERT_50
);
}
}
}
}
//Issue51656 Add resizeable margin on page preview from maoyg
void
ScPreview
::
SetSelectedTabs
(
const
ScMarkData
&
rMark
)
{
rMark
.
GetSelectedTabs
(
maSelectedTabs
);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sc/source/ui/view/prevwsh.cxx
Dosyayı görüntüle @
8724aa7d
...
@@ -159,6 +159,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
...
@@ -159,6 +159,7 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame,
ScViewData
*
pData
=
pTabViewShell
->
GetViewData
();
ScViewData
*
pData
=
pTabViewShell
->
GetViewData
();
pData
->
WriteUserDataSequence
(
aSourceData
);
pData
->
WriteUserDataSequence
(
aSourceData
);
InitStartTable
(
pData
->
GetTabNo
()
);
InitStartTable
(
pData
->
GetTabNo
()
);
pPreview
->
SetSelectedTabs
(
pData
->
GetMarkData
());
// also have to store the TabView's DesignMode state
// also have to store the TabView's DesignMode state
// (only if draw view exists)
// (only if draw view exists)
...
...
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