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
80d1ada9
Kaydet (Commit)
80d1ada9
authored
Şub 19, 2017
tarafından
Pranav Kant
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sd lok: Use IDs in ViewAnnotations output
Change-Id: Ifb1f55ad5a1d21d63f9b37a83e3218c40dfa0b59
üst
46be94e3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
1 deletion
+13
-1
Annotation.hxx
sd/inc/Annotation.hxx
+2
-0
Annotation.cxx
sd/source/core/annotations/Annotation.cxx
+9
-0
unomodel.cxx
sd/source/ui/unoidl/unomodel.cxx
+2
-1
No files found.
sd/inc/Annotation.hxx
Dosyayı görüntüle @
80d1ada9
...
@@ -35,6 +35,8 @@ void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotat
...
@@ -35,6 +35,8 @@ void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotat
SdrUndoAction
*
CreateUndoInsertOrRemoveAnnotation
(
const
css
::
uno
::
Reference
<
css
::
office
::
XAnnotation
>&
xAnnotation
,
bool
bInsert
);
SdrUndoAction
*
CreateUndoInsertOrRemoveAnnotation
(
const
css
::
uno
::
Reference
<
css
::
office
::
XAnnotation
>&
xAnnotation
,
bool
bInsert
);
sal_uInt32
getAnnotationId
(
const
css
::
uno
::
Reference
<
css
::
office
::
XAnnotation
>&
xAnnotation
);
}
}
#endif
#endif
...
...
sd/source/core/annotations/Annotation.cxx
Dosyayı görüntüle @
80d1ada9
...
@@ -370,6 +370,15 @@ SdrUndoAction* CreateUndoInsertOrRemoveAnnotation( const Reference< XAnnotation
...
@@ -370,6 +370,15 @@ SdrUndoAction* CreateUndoInsertOrRemoveAnnotation( const Reference< XAnnotation
}
}
}
}
sal_uInt32
getAnnotationId
(
const
Reference
<
XAnnotation
>&
xAnnotation
)
{
Annotation
*
pAnnotation
=
dynamic_cast
<
Annotation
*>
(
xAnnotation
.
get
());
sal_uInt32
nId
=
0
;
if
(
pAnnotation
)
nId
=
pAnnotation
->
GetId
();
return
nId
;
}
UndoInsertOrRemoveAnnotation
::
UndoInsertOrRemoveAnnotation
(
Annotation
&
rAnnotation
,
bool
bInsert
)
UndoInsertOrRemoveAnnotation
::
UndoInsertOrRemoveAnnotation
(
Annotation
&
rAnnotation
,
bool
bInsert
)
:
SdrUndoAction
(
*
rAnnotation
.
GetModel
()
)
:
SdrUndoAction
(
*
rAnnotation
.
GetModel
()
)
,
mxAnnotation
(
&
rAnnotation
)
,
mxAnnotation
(
&
rAnnotation
)
...
...
sd/source/ui/unoidl/unomodel.cxx
Dosyayı görüntüle @
80d1ada9
...
@@ -78,6 +78,7 @@
...
@@ -78,6 +78,7 @@
#include "ViewShellBase.hxx"
#include "ViewShellBase.hxx"
#include <UnoDocumentSettings.hxx>
#include <UnoDocumentSettings.hxx>
#include <Annotation.hxx>
#include <drawdoc.hxx>
#include <drawdoc.hxx>
#include <glob.hrc>
#include <glob.hrc>
#include <sdresid.hxx>
#include <sdresid.hxx>
...
@@ -2380,7 +2381,7 @@ OUString SdXImpressDocument::getPostIts()
...
@@ -2380,7 +2381,7 @@ OUString SdXImpressDocument::getPostIts()
uno
::
Reference
<
office
::
XAnnotation
>
xAnnotation
(
aPageAnnotation
);
uno
::
Reference
<
office
::
XAnnotation
>
xAnnotation
(
aPageAnnotation
);
boost
::
property_tree
::
ptree
aAnnotation
;
boost
::
property_tree
::
ptree
aAnnotation
;
aAnnotation
.
put
(
"id"
,
sd
::
getAnnotationId
(
xAnnotation
));
aAnnotation
.
put
(
"author"
,
xAnnotation
->
getAuthor
());
aAnnotation
.
put
(
"author"
,
xAnnotation
->
getAuthor
());
aAnnotation
.
put
(
"dateTime"
,
utl
::
toISO8601
(
xAnnotation
->
getDateTime
()));
aAnnotation
.
put
(
"dateTime"
,
utl
::
toISO8601
(
xAnnotation
->
getDateTime
()));
uno
::
Reference
<
text
::
XText
>
xText
(
xAnnotation
->
getTextRange
());
uno
::
Reference
<
text
::
XText
>
xText
(
xAnnotation
->
getTextRange
());
...
...
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