Skip to content

C
core
Kaydet (Commit) 73a395cd authored tarafından Thorsten Behrens's avatar Thorsten Behrens
Dosyalara gözat
Seçenekler

Make merges of impress210 build.

üst e57053c4
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
sd/source/ui/annotations/annotationmanager.cxx
Dosyayı görüntüle @ 73a395cd
...@@ -153,7 +153,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase ) ...@@ -153,7 +153,7 @@ static SfxDispatcher* getDispatcher( ViewShellBase& rBase )
com::sun::star::util::DateTime getCurrentDateTime() com::sun::star::util::DateTime getCurrentDateTime()
{ {
DateTime aCurrentDate; DateTime aCurrentDate( DateTime::SYSTEM );
return com::sun::star::util::DateTime( 0, aCurrentDate.GetSec(), aCurrentDate.GetMin(), aCurrentDate.GetHour(), aCurrentDate.GetDay(), aCurrentDate.GetMonth(), aCurrentDate.GetYear() ); return com::sun::star::util::DateTime( 0, aCurrentDate.GetSec(), aCurrentDate.GetMin(), aCurrentDate.GetHour(), aCurrentDate.GetDay(), aCurrentDate.GetMonth(), aCurrentDate.GetYear() );
} }
......
svx/inc/galtheme.hrc
Dosyayı görüntüle @ 73a395cd
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#define RID_GALLERYSTR_THEME_MAPS (RID_GALLERYSTR_THEME_START + 12) #define RID_GALLERYSTR_THEME_MAPS (RID_GALLERYSTR_THEME_START + 12)
#define RID_GALLERYSTR_THEME_PEOPLE (RID_GALLERYSTR_THEME_START + 13) #define RID_GALLERYSTR_THEME_PEOPLE (RID_GALLERYSTR_THEME_START + 13)
#define RID_GALLERYSTR_THEME_SURFACES (RID_GALLERYSTR_THEME_START + 14) #define RID_GALLERYSTR_THEME_SURFACES (RID_GALLERYSTR_THEME_START + 14)
// free #define RID_GALLERYSTR_THEME_HTMLBUTTONS (RID_GALLERYSTR_THEME_START + 15)
#define RID_GALLERYSTR_THEME_POWERPOINT (RID_GALLERYSTR_THEME_START + 16) #define RID_GALLERYSTR_THEME_POWERPOINT (RID_GALLERYSTR_THEME_START + 16)
#define RID_GALLERYSTR_THEME_RULERS (RID_GALLERYSTR_THEME_START + 17) #define RID_GALLERYSTR_THEME_RULERS (RID_GALLERYSTR_THEME_START + 17)
#define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18) #define RID_GALLERYSTR_THEME_SOUNDS (RID_GALLERYSTR_THEME_START + 18)
......
svx/inc/svx/gallery.hxx
Dosyayı görüntüle @ 73a395cd
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
#define GALLERY_THEME_MAPS 12 #define GALLERY_THEME_MAPS 12
#define GALLERY_THEME_PEOPLE 13 #define GALLERY_THEME_PEOPLE 13
#define GALLERY_THEME_SURFACES 14 #define GALLERY_THEME_SURFACES 14
// free #define GALLERY_THEME_HTMLBUTTONS 15
#define GALLERY_THEME_POWERPOINT 16 #define GALLERY_THEME_POWERPOINT 16
#define GALLERY_THEME_RULERS 17 #define GALLERY_THEME_RULERS 17
#define GALLERY_THEME_SOUNDS 18 #define GALLERY_THEME_SOUNDS 18
......
sw/inc/doc.hxx
Dosyayı görüntüle @ 73a395cd
...@@ -591,7 +591,7 @@ private: ...@@ -591,7 +591,7 @@ private:
sal_Bool mbStartIdleTimer; // idle timer mode start/stop sal_Bool mbStartIdleTimer; // idle timer mode start/stop
bool mbSetDrawDefaults; // set draw pool defaults for freshly created documents bool mbSetDrawDefaults; // set draw pool defaults for freshly created documents
static SwAutoCompleteWord *pACmpltWords; // List of all words for AutoComplete static SwAutoCompleteWord *pACmpltWords; // List of all words for AutoComplete
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment