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
b2a76e66
Kaydet (Commit)
b2a76e66
authored
Mar 01, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
move SvtLinguOptions into SmDocShell
Change-Id: I46b84ab4cb9cc5d25b6cb60241fcc8a65e449886
üst
c2b1336b
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
14 deletions
+12
-14
document.hxx
starmath/inc/document.hxx
+4
-4
document.cxx
starmath/source/document.cxx
+7
-9
edit.cxx
starmath/source/edit.cxx
+1
-1
No files found.
starmath/inc/document.hxx
Dosyayı görüntüle @
b2a76e66
...
...
@@ -29,6 +29,7 @@
#include <vcl/jobset.hxx>
#include <vcl/virdev.hxx>
#include <sax/fshelper.hxx>
#include <unotools/lingucfg.hxx>
#include <oox/core/filterbase.hxx>
#include <oox/mathml/import.hxx>
#include <oox/export/utils.hxx>
...
...
@@ -65,7 +66,6 @@ class SmCursor;
class
SmDocShell
;
class
EditEngine
;
class
SmPrinterAccess
{
VclPtr
<
Printer
>
pPrinter
;
...
...
@@ -77,9 +77,7 @@ public:
OutputDevice
*
GetRefDev
()
{
return
pRefDev
.
get
();
}
};
void
SetEditEngineDefaultFonts
(
SfxItemPool
&
rEditEngineItemPool
);
void
SetEditEngineDefaultFonts
(
SfxItemPool
&
rEditEngineItemPool
,
const
SvtLinguOptions
&
rOpt
);
class
SM_DLLPUBLIC
SmDocShell
:
public
SfxObjectShell
,
public
SfxListener
{
...
...
@@ -90,6 +88,7 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
SmFormat
maFormat
;
SmParser
maParser
;
OUString
maAccText
;
SvtLinguOptions
maLinguOptions
;
SmTableNode
*
mpTree
;
SfxItemPool
*
mpEditEngineItemPool
;
EditEngine
*
mpEditEngine
;
...
...
@@ -188,6 +187,7 @@ public:
EditEngine
&
GetEditEngine
();
SfxItemPool
&
GetEditEngineItemPool
();
const
SvtLinguOptions
&
GetLinguOptions
()
const
{
return
maLinguOptions
;
}
void
DrawFormula
(
OutputDevice
&
rDev
,
Point
&
rPosition
,
bool
bDrawSelection
=
false
);
Size
GetSize
();
...
...
starmath/source/document.cxx
Dosyayı görüntüle @
b2a76e66
...
...
@@ -46,7 +46,6 @@
#include <svl/fstathelper.hxx>
#include <svl/intitem.hxx>
#include <svl/itempool.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/linguprops.hxx>
#include <unotools/pathoptions.hxx>
#include <svl/ptitem.hxx>
...
...
@@ -287,12 +286,9 @@ void SmDocShell::ArrangeFormula()
maAccText
.
clear
();
}
void
SetEditEngineDefaultFonts
(
SfxItemPool
&
rEditEngineItemPool
)
void
SetEditEngineDefaultFonts
(
SfxItemPool
&
rEditEngineItemPool
,
const
SvtLinguOptions
&
rOpt
)
{
// set fonts to be used
SvtLinguOptions
aOpt
;
SvtLinguConfig
().
GetOptions
(
aOpt
);
struct
FontDta
{
sal_Int16
nFallbackLang
;
sal_Int16
nLang
;
...
...
@@ -310,9 +306,9 @@ void SetEditEngineDefaultFonts(SfxItemPool &rEditEngineItemPool)
{
LANGUAGE_ARABIC_SAUDI_ARABIA
,
LANGUAGE_NONE
,
DefaultFontType
::
CTL_TEXT
,
EE_CHAR_FONTINFO_CTL
}
};
aTable
[
0
].
nLang
=
a
Opt
.
nDefaultLanguage
;
aTable
[
1
].
nLang
=
a
Opt
.
nDefaultLanguage_CJK
;
aTable
[
2
].
nLang
=
a
Opt
.
nDefaultLanguage_CTL
;
aTable
[
0
].
nLang
=
r
Opt
.
nDefaultLanguage
;
aTable
[
1
].
nLang
=
r
Opt
.
nDefaultLanguage_CJK
;
aTable
[
2
].
nLang
=
r
Opt
.
nDefaultLanguage_CTL
;
for
(
FontDta
&
rFntDta
:
aTable
)
{
...
...
@@ -348,7 +344,7 @@ EditEngine& SmDocShell::GetEditEngine()
mpEditEngineItemPool
=
EditEngine
::
CreatePool
();
SetEditEngineDefaultFonts
(
*
mpEditEngineItemPool
);
SetEditEngineDefaultFonts
(
*
mpEditEngineItemPool
,
maLinguOptions
);
mpEditEngine
=
new
EditEngine
(
mpEditEngineItemPool
);
...
...
@@ -640,6 +636,8 @@ SmDocShell::SmDocShell( SfxModelFlags i_nSfxCreationFlags )
,
mnModifyCount
(
0
)
,
mbFormulaArranged
(
false
)
{
SvtLinguConfig
().
GetOptions
(
maLinguOptions
);
SetPool
(
&
SfxGetpApp
()
->
GetPool
());
SmModule
*
pp
=
SM_MOD
();
...
...
starmath/source/edit.cxx
Dosyayı görüntüle @
b2a76e66
...
...
@@ -230,7 +230,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
pEditEngine
->
SetDefTab
(
sal_uInt16
(
GetTextWidth
(
"XXXX"
)));
SetEditEngineDefaultFonts
(
pDoc
->
GetEditEngineItemPool
());
SetEditEngineDefaultFonts
(
pDoc
->
GetEditEngineItemPool
()
,
pDoc
->
GetLinguOptions
()
);
// forces new settings to be used
// unfortunately this resets the whole edit engine
...
...
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